diff --git a/composer.json b/composer.json
index 23d073a36fb70..09dbd22e3ac2e 100644
--- a/composer.json
+++ b/composer.json
@@ -46,6 +46,6 @@
         "phpunit/dbunit": "~1.3",
         "friendsofphp/php-cs-fixer": "~1.11",
         "squizlabs/php_codesniffer": "~1.5",
-        "pear/cache_lite": "1.7.16"
+        "pear/cache_lite": "1.8.0"
     }
 }
diff --git a/composer.lock b/composer.lock
index 6dafa57252c59..09fd2052c5af0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "daa4d4b6a73822868e5c7867d75fbb43",
-    "content-hash": "536a29057a3e638aad1efdfae65e9433",
+    "hash": "0bcff7c61f95c68adc76178b8b2c7cc8",
+    "content-hash": "5321237d122c5aecd1bb224c44db92f4",
     "packages": [
         {
             "name": "ircmaxell/password-compat",
@@ -1165,16 +1165,16 @@
         },
         {
             "name": "pear/cache_lite",
-            "version": "v1.7.16",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Cache_Lite.git",
-                "reference": "9fa08bd625f86946d41a6e7ff66f6f4ea5c0f0bb"
+                "reference": "a3ad6baed101247a3e4a0806113b6f755060f3a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Cache_Lite/zipball/9fa08bd625f86946d41a6e7ff66f6f4ea5c0f0bb",
-                "reference": "9fa08bd625f86946d41a6e7ff66f6f4ea5c0f0bb",
+                "url": "https://api.github.com/repos/pear/Cache_Lite/zipball/a3ad6baed101247a3e4a0806113b6f755060f3a3",
+                "reference": "a3ad6baed101247a3e4a0806113b6f755060f3a3",
                 "shasum": ""
             },
             "require": {
@@ -1211,7 +1211,7 @@
             "keywords": [
                 "cache"
             ],
-            "time": "2014-05-11 15:02:19"
+            "time": "2016-07-04 05:20:43"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
diff --git a/libraries/vendor/composer/ClassLoader.php b/libraries/vendor/composer/ClassLoader.php
index ff6ecfb822f89..ac67d302a1866 100644
--- a/libraries/vendor/composer/ClassLoader.php
+++ b/libraries/vendor/composer/ClassLoader.php
@@ -53,8 +53,8 @@ class ClassLoader
 
     private $useIncludePath = false;
     private $classMap = array();
-
     private $classMapAuthoritative = false;
+    private $missingClasses = array();
 
     public function getPrefixes()
     {
@@ -322,20 +322,20 @@ public function findFile($class)
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
             return false;
         }
 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION')) {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if ($file === null) {
+        if (false === $file) {
             // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
+            $this->missingClasses[$class] = true;
         }
 
         return $file;
@@ -399,6 +399,8 @@ private function findFileWithExtension($class, $ext)
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
+
+        return false;
     }
 }