Use the new Cache::registry() method within the Cache class.

Author: dakota

src/Cache/Cache.php

@@ -135,9 +135,7 @@ public static function registry()
      */
     protected static function _buildEngine($name)
     {
-        if (empty(static::$_registry)) {
-            static::$_registry = new CacheRegistry();
-        }
+        $registry = static::registry();
 
         if (empty(static::$_config[$name]['className'])) {
             throw new InvalidArgumentException(
@@ -146,7 +144,7 @@ protected static function _buildEngine($name)
         }
 
         $config = static::$_config[$name];
-        static::$_registry->load($name, $config);
+        $registry->load($name, $config);
 
         if (!empty($config['groups'])) {
             foreach ($config['groups'] as $group) {
@@ -172,12 +170,14 @@ public static function engine($config)
             return new NullEngine();
         }
 
-        if (isset(static::$_registry->{$config})) {
-            return static::$_registry->{$config};
+        $registry = static::registry();
+
+        if (isset($registry->{$config})) {
+            return $registry->{$config};
         }
 
         static::_buildEngine($config);
-        return static::$_registry->{$config};
+        return $registry->{$config};
     }
 
     /**