diff --git a/app/bootstrap.php.cache b/app/bootstrap.php.cache
index 09b077c768..d3566b9d07 100644
--- a/app/bootstrap.php.cache
+++ b/app/bootstrap.php.cache
@@ -2428,12 +2428,12 @@ protected $booted = false;
 protected $name;
 protected $startTime;
 protected $loadClassCache;
-const VERSION ='2.8.4-DEV';
-const VERSION_ID = 20804;
+const VERSION ='2.8.5';
+const VERSION_ID = 20805;
 const MAJOR_VERSION = 2;
 const MINOR_VERSION = 8;
-const RELEASE_VERSION = 4;
-const EXTRA_VERSION ='DEV';
+const RELEASE_VERSION = 5;
+const EXTRA_VERSION ='';
 const END_OF_MAINTENANCE ='11/2018';
 const END_OF_LIFE ='11/2019';
 public function __construct($environment, $debug)
@@ -2883,8 +2883,9 @@ return true;
 }
 public function findFile($class)
 {
-if (false === $file = apcu_fetch($this->prefix.$class)) {
-apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class));
+$file = apcu_fetch($this->prefix.$class, $success);
+if (!$success) {
+apcu_store($this->prefix.$class, $file = $this->decorated->findFile($class) ?: null);
 }
 return $file;
 }
diff --git a/composer.json b/composer.json
index ea48a0e8f0..4a64ffab80 100755
--- a/composer.json
+++ b/composer.json
@@ -76,22 +76,22 @@
         "sonata-project/seo-bundle": "~2.0",
         "sonata-project/doctrine-extensions": "~1@dev",
         "sonata-project/intl-bundle": "~2.2@dev",
-        "sonata-project/admin-bundle": "dev-master as 2.4",
-        "sonata-project/doctrine-orm-admin-bundle": "dev-master as 2.4",
+        "sonata-project/admin-bundle": "3.x-dev as 2.4",
+        "sonata-project/doctrine-orm-admin-bundle": "3.x-dev as 2.4",
         "sonata-project/notification-bundle": "~2.2@dev",
-        "sonata-project/block-bundle": "dev-master as 2.4",
+        "sonata-project/block-bundle": "3.x-dev as 2.4",
         "sonata-project/media-bundle": "~2.4@dev",
         "sonata-project/user-bundle": "~2.2@dev",
         "sonata-project/cache-bundle": "~2.1@dev",
         "sonata-project/cache": "~1.0@dev",
         "sonata-project/page-bundle": "dev-master",
-        "sonata-project/core-bundle": "dev-master as 2.4",
+        "sonata-project/core-bundle": "3.x-dev as 2.4",
         "sonata-project/formatter-bundle": "~2.4@dev",
 
         "sonata-project/datagrid-bundle": "~2.2@dev",
         "sonata-project/exporter": "~1.3@dev",
         "sonata-project/timeline-bundle": "~2.3@dev",
-        "sonata-project/classification-bundle": "dev-master as 2.3",
+        "sonata-project/classification-bundle": "3.x-dev as 2.3",
         "sonata-project/comment-bundle": "~2.2@dev",
         "sonata-project/sonata-composer": "dev-master",