diff -urNd cacherouter.orig/Cache.php cacherouter/Cache.php
--- cacherouter.orig/Cache.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/Cache.php	2010-01-23 18:36:31.000000000 -0800
@@ -5,7 +5,7 @@
  * @file Cache.php
  *   Defines the base class for cache engines
  */
-class Cache {
+class CacheEngine {
   var $settings = array();
   var $content = array();
   var $prefix;
diff -urNd cacherouter.orig/CacheRouter.php cacherouter/CacheRouter.php
--- cacherouter.orig/CacheRouter.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/CacheRouter.php	2010-01-23 18:44:48.000000000 -0800
@@ -29,8 +29,8 @@
     
     $this->type[$bin] = $type;
     
-    if (!class_exists($type . 'Cache')) {
-      if (!require(dirname(__FILE__) .'/engines/' . $type . '.php')) {
+    if (!class_exists($type . 'CacheEngine')) {
+      if (!require_once(dirname(__FILE__) .'/engines/' . $type . '.php')) {
         return FALSE;
       }
     }
@@ -103,4 +103,4 @@
     $bin = ($bin == 'default') ? 'cache' : $bin;
     return $this->type[$bin];
   }
-}
\ No newline at end of file
+}
diff -urNd cacherouter.orig/cacherouter.inc cacherouter/cacherouter.inc
--- cacherouter.orig/cacherouter.inc	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/cacherouter.inc	2010-01-23 18:49:03.000000000 -0800
@@ -19,11 +19,11 @@
  */
 function cache_get($key, $table = 'cache') {
   global $cache, $user;
-  if (!isset($cache)) {
-    $cache = new CacheRouter();
+  if (!isset($cacherouter)) {
+    $cacherouter = new CacheRouter();
   }
   
-  $cache_object = $cache->get($key, $table);  
+  $cache_object = $cacherouter->get($key, $table);  
   if (isset($cache_object->data)) {
     if ($cache_object->expire == CACHE_PERMANENT || !variable_get('cache_lifetime', 0)) {
       return $cache_object;
@@ -86,11 +86,11 @@
  *   A string containing HTTP header information for cached pages.
  */
 function cache_set($key, $value, $table = 'cache', $expire = CACHE_PERMANENT, $headers = NULL) {
-  global $cache;
-  if (!isset($cache)) {
-    $cache = new CacheRouter();
+  global $cacherouter;
+  if (!isset($cacherouter)) {
+    $cacherouter = new CacheRouter();
   }
-  return $cache->set($key, $value, $expire, $headers, $table);
+  return $cacherouter->set($key, $value, $expire, $headers, $table);
 }
 
 /**
@@ -112,18 +112,18 @@
  *   match. If '*' is given as $key, the table $table will be emptied.
  */
 function cache_clear_all($key = NULL, $table = NULL, $wildcard = FALSE) {
-  global $cache;
+  global $cacherouter;
   global $user;
 
-  if (!isset($cache)) {
-    $cache = new CacheRouter();
+  if (!isset($cacherouter)) {
+    $cacherouter = new CacheRouter();
   }
 
   if (!isset($key) && !isset($table)) {
     // Clear the block cache first, so stale data will
     // not end up in the page cache.
-    $cache->flush('cache_block');
-    $cache->flush('cache_page');
+    $cacherouter->flush('cache_block');
+    $cacherouter->flush('cache_page');
     return;
   }
 
@@ -143,27 +143,27 @@
       else if (time() > ($cache_flush + variable_get('cache_lifetime', 0))) {
         // Clear the cache for everyone, cache_flush_delay seconds have
         // passed since the first request to clear the cache.
-        $cache->flush($table);
+        $cacherouter->flush($table);
         variable_set('cache_flush', 0);
       }
     }
     else {
       // No minimum cache lifetime, flush all temporary cache entries now.
-      $cache->flush($table);
+      $cacherouter->flush($table);
     }
   }
   else {
     if ($wildcard) {
       if ($key == '*' || empty($key)) {
-        $cache->delete('*', $table);
+        $cacherouter->delete('*', $table);
       }
       else {
-        $cache->delete($key .'*', $table);
+        $cacherouter->delete($key .'*', $table);
       }
     }
     else {
       $key = str_replace('*', '', $key);
-      $cache->delete($key, $table);
+      $cacherouter->delete($key, $table);
     }
   }
 }
@@ -174,14 +174,14 @@
 if (!function_exists('page_cache_fastpath')) {
   function page_cache_fastpath() {
     global $base_root;
-    global $cache;
+    global $cacherouter;
   
     if (empty($_POST) && !isset($_COOKIE['DRUPAL_UID'])) {
-      if (!isset($cache)) {
-        $cache = new CacheRouter();
+      if (!isset($cacherouter)) {
+        $cacherouter = new CacheRouter();
       }
-      if ($cache->page_fast_cache('cache_page')) {
-        $page = $cache->get($base_root . request_uri(), 'cache_page');
+      if ($cacherouter->page_fast_cache('cache_page')) {
+        $page = $cacherouter->get($base_root . request_uri(), 'cache_page');
         if (!empty($page)) {
           drupal_page_header();
         
@@ -207,4 +207,4 @@
     }
     return FALSE;
   }
-}
\ No newline at end of file
+}
diff -urNd cacherouter.orig/engines/apc.php cacherouter/engines/apc.php
--- cacherouter.orig/engines/apc.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/engines/apc.php	2010-01-23 18:49:20.000000000 -0800
@@ -5,7 +5,7 @@
  * @file apc.php
  *   APC engine class.
  */
-class apcCache extends Cache {
+class apcCache extends CacheEngine {
   /**
    * page_fast_cache
    *   This tells CacheRouter to use page_fast_cache.
@@ -26,17 +26,17 @@
    *   Returns either the cache object or FALSE on failure
    */
   function get($key) {
-    $cache = parent::get($this->key($key));
-    if (isset($cache)) {
-      return $cache;
+    $cacherouter = parent::get($this->key($key));
+    if (isset($cacherouter)) {
+      return $cacherouter;
     }
     
-    $cache = apc_fetch($this->key($key));
-    if (is_object($cache) && $cache->serialized) {
-      $cache->data = unserialize($cache->data);
+    $cacherouter = apc_fetch($this->key($key));
+    if (is_object($cacherouter) && $cacherouter->serialized) {
+      $cacherouter->data = unserialize($cacherouter->data);
     }
-    parent::set($this->key($key), $cache);
-    return $cache;
+    parent::set($this->key($key), $cacherouter);
+    return $cacherouter;
   }
 
   /**
@@ -56,11 +56,11 @@
    */
   function set($key, $value, $expire = CACHE_PERMANENT, $headers = NULL) {
     // Create new cache object.
-    $cache = new stdClass;
-    $cache->cid = $key;
-    $cache->created = time();
-    $cache->expire = $expire;
-    $cache->headers = $headers;
+    $cacherouter = new stdClass;
+    $cacherouter->cid = $key;
+    $cacherouter->created = time();
+    $cacherouter->expire = $expire;
+    $cacherouter->headers = $headers;
 
     if ($expire != CACHE_PERMANENT && $expire != CACHE_TEMPORARY) {
       // Convert Drupal $expire, which is a timestamp, to a TTL for APC
@@ -71,12 +71,12 @@
     }
 
     if (!is_string($value)) {
-      $cache->serialized = TRUE;
-      $cache->data = serialize($value);
+      $cacherouter->serialized = TRUE;
+      $cacherouter->data = serialize($value);
     }
     else { 
-      $cache->serialized = FALSE;
-      $cache->data = $value;
+      $cacherouter->serialized = FALSE;
+      $cacherouter->data = $value;
     }
 
     $return = FALSE;
@@ -98,7 +98,7 @@
       }
       else {
         // Update static cache
-        parent::set($this->key($key), $cache);
+        parent::set($this->key($key), $cacherouter);
         $return = TRUE;
       }
       
@@ -215,4 +215,4 @@
     );
     return $stats;
   }
-}
\ No newline at end of file
+}
diff -urNd cacherouter.orig/engines/db.php cacherouter/engines/db.php
--- cacherouter.orig/engines/db.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/engines/db.php	2010-01-23 18:49:23.000000000 -0800
@@ -5,7 +5,7 @@
  * @file db.php
  *   Database engine file.
  */
-class dbCache extends Cache {  
+class dbCache extends CacheEngine {  
   function page_fast_cache() {
     if ($this->fast_cache === TRUE) {
       require_once './includes/database.inc';
@@ -17,44 +17,44 @@
   function get($key) {
     global $user;
     
-    $cache = parent::get($key);
-    if ($cache) {
-      return $cache;
+    $cacherouter = parent::get($key);
+    if ($cacherouter) {
+      return $cacherouter;
     }
     
-    $cache = db_fetch_object(db_query("SELECT data, created, headers, expire, serialized FROM {". $this->name ."} WHERE cid = '%s'", $key));
-    if (isset($cache->data)) {
-      $cache->data = db_decode_blob($cache->data);
-      if ($cache->serialized) {
-        $cache->data = unserialize($cache->data);
+    $cacherouter = db_fetch_object(db_query("SELECT data, created, headers, expire, serialized FROM {". $this->name ."} WHERE cid = '%s'", $key));
+    if (isset($cacherouter->data)) {
+      $cacherouter->data = db_decode_blob($cacherouter->data);
+      if ($cacherouter->serialized) {
+        $cacherouter->data = unserialize($cacherouter->data);
       }
 	  }
-	  parent::set($key, $cache);
-	  return $cache;
+	  parent::set($key, $cacherouter);
+	  return $cacherouter;
   }
   
   function set($key, $value, $expire = CACHE_PERMANENT, $headers = NULL) {
     // Create new cache object.
-    $cache = new stdClass;
-    $cache->cid = $key;
-    $cache->created = time();
-    $cache->headers = $headers;
-    $cache->expire = $expire;
+    $cacherouter = new stdClass;
+    $cacherouter->cid = $key;
+    $cacherouter->created = time();
+    $cacherouter->headers = $headers;
+    $cacherouter->expire = $expire;
 
     if (!is_string($value)) {
-      $cache->serialized = TRUE;
-      $cache->data = serialize($value);
+      $cacherouter->serialized = TRUE;
+      $cacherouter->data = serialize($value);
     }
     else { 
-      $cache->serialized = FALSE;
-      $cache->data = $value;
+      $cacherouter->serialized = FALSE;
+      $cacherouter->data = $value;
     }
 
-    db_query("UPDATE {". $this->name ."} SET data = %b, created = %d, expire = %d, headers = '%s', serialized = %d WHERE cid = '%s'", $cache->data, $cache->created, $cache->expire, $cache->headers, $cache->serialized, $key);
+    db_query("UPDATE {". $this->name ."} SET data = %b, created = %d, expire = %d, headers = '%s', serialized = %d WHERE cid = '%s'", $cacherouter->data, $cacherouter->created, $cacherouter->expire, $cacherouter->headers, $cacherouter->serialized, $key);
     if (!db_affected_rows()) {
-      @db_query("INSERT INTO {". $this->name ."} (cid, data, created, expire, headers, serialized) VALUES ('%s', %b, %d, %d, '%s', %d)", $key, $cache->data, $cache->created, $cache->expire, $cache->headers, $cache->serialized);
+      @db_query("INSERT INTO {". $this->name ."} (cid, data, created, expire, headers, serialized) VALUES ('%s', %b, %d, %d, '%s', %d)", $key, $cacherouter->data, $cacherouter->created, $cacherouter->expire, $cacherouter->headers, $cacherouter->serialized);
     }
-    parent::set($key, $cache);
+    parent::set($key, $cacherouter);
   }
   
   function delete($key) {
diff -urNd cacherouter.orig/engines/eacc.php cacherouter/engines/eacc.php
--- cacherouter.orig/engines/eacc.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/engines/eacc.php	2010-01-23 18:49:29.000000000 -0800
@@ -5,7 +5,7 @@
  * @file eacc.php
  *   Engine file for eAccelerator.
  */
-class eaccCache extends Cache {
+class eaccCache extends CacheEngine {
   /**
    * page_fast_cache
    *   This tells CacheRouter to use page_fast_cache.
@@ -26,20 +26,20 @@
    *   Returns either the cache object or FALSE on failure
    */
   function get($key) {
-    $cache = parent::get($this->key($key));
-    if (isset($cache)) {
-      return $cache;
+    $cacherouter = parent::get($this->key($key));
+    if (isset($cacherouter)) {
+      return $cacherouter;
     }
 
-    $cache = eaccelerator_get($this->key($key));
-    if (!empty($cache)) {
-      $cache = unserialize($cache);
+    $cacherouter = eaccelerator_get($this->key($key));
+    if (!empty($cacherouter)) {
+      $cacherouter = unserialize($cacherouter);
     }
     else {
-      $cache = FALSE;
+      $cacherouter = FALSE;
     }
-    parent::set($this->key($key), $cache);
-    return $cache;
+    parent::set($this->key($key), $cacherouter);
+    return $cacherouter;
   }
 
   /**
@@ -59,12 +59,12 @@
    */
   function set($key, $value, $expire = CACHE_PERMANENT, $headers = NULL) {
     // Create new cache object.
-    $cache = new stdClass;
-    $cache->cid = $key;
-    $cache->created = time();
-    $cache->expire = $expire;
-    $cache->headers = $headers;
-    $cache->data = $value;
+    $cacherouter = new stdClass;
+    $cacherouter->cid = $key;
+    $cacherouter->created = time();
+    $cacherouter->expire = $expire;
+    $cacherouter->headers = $headers;
+    $cacherouter->data = $value;
     
     if ($expire != CACHE_PERMANENT && $expire != CACHE_TEMPORARY) {
       // Convert Drupal $expire, which is a timestamp, to a TTL
@@ -87,13 +87,13 @@
       $lookup[$this->key($key)] = $expire;
       
       // Attempt to store full key and value
-      if (!eaccelerator_put($this->key($key), serialize($cache), $ttl)) {
+      if (!eaccelerator_put($this->key($key), serialize($cacherouter), $ttl)) {
         unset($lookup[$this->key($key)]);
         $return = FALSE;
       }
       else {
         // Update static cache
-        parent::set($this->key($key), $cache);
+        parent::set($this->key($key), $cacherouter);
         $return = TRUE;
       }
 
diff -urNd cacherouter.orig/engines/file.php cacherouter/engines/file.php
--- cacherouter.orig/engines/file.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/engines/file.php	2010-01-23 18:49:30.000000000 -0800
@@ -5,7 +5,7 @@
  * @file file.php
  *   Engine file for file based.
  */
-class fileCache extends Cache {
+class fileCache extends CacheEngine {
   var $content = array();
   var $fspath = '/tmp/filecache';
   
@@ -38,19 +38,19 @@
 
     //make sure fast cache is enabled (see CacheRouter function page_fast_cache)
     if ($this->page_fast_cache()) {
-      $cache = NULL;
+      $cacherouter = NULL;
       $cache_file = $this->key($key);
       if (file_exists($cache_file)) {    
         if ($fp = fopen($cache_file, 'r')) {
           if (flock($fp, LOCK_SH)) {
             $data = @fread($fp, filesize($cache_file));
             flock($fp, LOCK_UN);
-            $cache = unserialize($data);
+            $cacherouter = unserialize($data);
           }
           fclose($fp);
         }
       }
-      return $cache;
+      return $cacherouter;
 
     }
     else {
@@ -61,17 +61,17 @@
       }
     }
 
-    if (isset($cache->data)) {
+    if (isset($cacherouter->data)) {
       // If enforcing a minimum cache lifetime, validate that the data is
       // currently valid for this user before we return it by making sure the
       // cache entry was created before the timestamp in the current session's
       // cache timer. The cache variable is loaded into the $user object by
       // sess_read() in session.inc.
-      if ($user->cache > $cache->created) {
+      if ($user->cache > $cacherouter->created) {
         // This cache data is too old and thus not valid for us, ignore it.
         return FALSE;
       }
-      return $cache;
+      return $cacherouter;
     }
     return FALSE;
   }
@@ -81,15 +81,15 @@
     //make sure fast cache is enabled (see CacheRouter function page_fast_cache)
     if ($this->page_fast_cache()) {
       // prepare the cache before grabbing the file lock
-      $cache = new stdClass;
-      $cache->cid = $key;
-      $cache->table = $this->name;
-      $cache->created = time();
-      $cache->expire = $expire;
-      $cache->headers = $headers;
-      $cache->data = $value;
+      $cacherouter = new stdClass;
+      $cacherouter->cid = $key;
+      $cacherouter->table = $this->name;
+      $cacherouter->created = time();
+      $cacherouter->expire = $expire;
+      $cacherouter->headers = $headers;
+      $cacherouter->data = $value;
       
-      $data = serialize($cache);
+      $data = serialize($cacherouter);
       
       $file = $this->key($key);
       if ($fp = @fopen($file, 'w')) {
@@ -263,10 +263,10 @@
             if (flock($fp, LOCK_SH)) {
               $data = @fread($fp, filesize($file->filename));
               flock($fp, LOCK_UN);
-              $cache = unserialize($data);
+              $cacherouter = unserialize($data);
             }
             fclose($fp);
-            if ($cache->expire != CACHE_PERMANENT && $cache->expire <= time()) {
+            if ($cacherouter->expire != CACHE_PERMANENT && $cacherouter->expire <= time()) {
               unlink($file->filename);
             }
           }
diff -urNd cacherouter.orig/engines/memcache.php cacherouter/engines/memcache.php
--- cacherouter.orig/engines/memcache.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/engines/memcache.php	2010-01-23 18:49:32.000000000 -0800
@@ -5,7 +5,7 @@
  * @file memcache.php
  *   Engine file for memcache.
  */
-class memcacheCache extends Cache {
+class memcacheCache extends CacheEngine {
   var $settings = array();
   var $memcache;
   
@@ -40,28 +40,28 @@
   
   function get($key) {
     // Attempt to pull from static cache.
-    $cache = parent::get($this->key($key));
-    if (isset($cache)) {
-      return $cache;
+    $cacherouter = parent::get($this->key($key));
+    if (isset($cacherouter)) {
+      return $cacherouter;
     }
     
     // Get from memcache
-    $cache = $this->memcache->get($this->key($key));
+    $cacherouter = $this->memcache->get($this->key($key));
     
     // Update static cache 
-    parent::set($this->key($key), $cache);
+    parent::set($this->key($key), $cacherouter);
     
-    return $cache;
+    return $cacherouter;
   }
   
   function set($key, $value, $expire = CACHE_PERMANENT, $headers = NULL) {    
     // Create new cache object.
-    $cache = new stdClass;
-    $cache->cid = $key;
-    $cache->created = time();
-    $cache->expire = $expire;
-    $cache->headers = $headers;
-    $cache->data = $value;
+    $cacherouter = new stdClass;
+    $cacherouter->cid = $key;
+    $cacherouter->created = time();
+    $cacherouter->expire = $expire;
+    $cacherouter->headers = $headers;
+    $cacherouter->data = $value;
     
     if ($expire == CACHE_TEMPORARY || $expire == CACHE_PERMENANT) {
       $set_expire = 0;  
@@ -88,7 +88,7 @@
           }
           else {
             // Update static cache
-            parent::set($this->key($key), $cache);
+            parent::set($this->key($key), $cacherouter);
             $return = TRUE;
           }
 
@@ -226,4 +226,4 @@
     );
     return $stats;
   }
-}
\ No newline at end of file
+}
diff -urNd cacherouter.orig/engines/memcached.php cacherouter/engines/memcached.php
--- cacherouter.orig/engines/memcached.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/engines/memcached.php	2010-01-23 18:49:33.000000000 -0800
@@ -10,7 +10,7 @@
  *   you use this on a production site.  You have been warned.
  *   ---
  */
-class memcachedCache extends Cache {
+class memcachedCache extends CacheEngine {
   var $settings = array();
   var $memcached;
   
@@ -45,18 +45,18 @@
   
   function get($key) {
     // Attempt to pull from static cache.
-    $cache = parent::get($this->key($key));
-    if (isset($cache)) {
-      return $cache;
+    $cacherouter = parent::get($this->key($key));
+    if (isset($cacherouter)) {
+      return $cacherouter;
     }
     
     // Get from memcached
-    $cache = $this->memcached->get($this->key($key));
+    $cacherouter = $this->memcached->get($this->key($key));
     
     // Update static cache 
-    parent::set($this->key($key), $cache);
+    parent::set($this->key($key), $cacherouter);
     
-    return $cache;
+    return $cacherouter;
   }
   
   function set($key, $value, $expire = CACHE_PERMANENT, $headers = NULL) {
@@ -65,12 +65,12 @@
     }
     
     // Create new cache object.
-    $cache = new stdClass;
-    $cache->cid = $key;
-    $cache->created = time();
-    $cache->expire = $expire;
-    $cache->headers = $headers;
-    $cache->data = $value;
+    $cacherouter = new stdClass;
+    $cacherouter->cid = $key;
+    $cacherouter->created = time();
+    $cacherouter->expire = $expire;
+    $cacherouter->headers = $headers;
+    $cacherouter->data = $value;
     
     if (!empty($key)) {
       if ($this->settings['shared']) {
@@ -93,7 +93,7 @@
           }
           else {
             // Update static cache
-            parent::set($this->key($key), $cache);
+            parent::set($this->key($key), $cacherouter);
             $return = TRUE;
           }
 
@@ -226,4 +226,4 @@
     );
     return $stats;
   }
-}
\ No newline at end of file
+}
diff -urNd cacherouter.orig/engines/none.php cacherouter/engines/none.php
--- cacherouter.orig/engines/none.php	2009-09-03 01:34:11.000000000 -0700
+++ cacherouter/engines/none.php	2010-01-23 18:37:39.000000000 -0800
@@ -6,7 +6,7 @@
  *   Disable caching altogether.  Useful for debugging and various situations
  *   where caching is undesired.  Please be very careful in using this engine.
  */
-class noneCache extends Cache {
+class noneCache extends CacheEngine {
   var $content = array();
   
   function page_fast_cache() {
@@ -49,4 +49,4 @@
     );
     return $stats;
   }
-}
\ No newline at end of file
+}
diff -urNd cacherouter.orig/engines/xcache.php cacherouter/engines/xcache.php
--- cacherouter.orig/engines/xcache.php	2009-09-05 06:03:25.000000000 -0700
+++ cacherouter/engines/xcache.php	2010-01-23 18:49:43.000000000 -0800
@@ -5,7 +5,7 @@
  * @file xcache.php
  *   Engine file for XCache.
  */
-class xcacheCache extends Cache {
+class xcacheCache extends CacheEngine {
   /**
    * page_fast_cache
    *   This tells CacheRouter to use page_fast_cache.
@@ -26,18 +26,18 @@
    *   Returns either the cache object or FALSE on failure
    */
   function get($key) {
-    $cache = parent::get($this->key($key));
-    if (isset($cache)) {
-      return $cache;
+    $cacherouter = parent::get($this->key($key));
+    if (isset($cacherouter)) {
+      return $cacherouter;
     }
     
     // Get item from cache    
-    $cache = unserialize(xcache_get($this->key($key)));
+    $cacherouter = unserialize(xcache_get($this->key($key)));
 
     // Update static cache
-    parent::set($this->key($key), $cache);
+    parent::set($this->key($key), $cacherouter);
 
-    return $cache;
+    return $cacherouter;
   }
 
   /**
@@ -57,12 +57,12 @@
    */
   function set($key, $value, $expire = CACHE_PERMANENT, $headers = NULL) {
     // Create new cache object.
-    $cache = new stdClass;
-    $cache->cid = $key;
-    $cache->created = time();
-    $cache->expire = $expire;
-    $cache->headers = $headers;
-    $cache->data = $value;
+    $cacherouter = new stdClass;
+    $cacherouter->cid = $key;
+    $cacherouter->created = time();
+    $cacherouter->expire = $expire;
+    $cacherouter->headers = $headers;
+    $cacherouter->data = $value;
 
     if ($expire != CACHE_PERMANENT && $expire != CACHE_TEMPORARY) {
       // Convert Drupal $expire, which is a timestamp, to a TTL
@@ -85,13 +85,13 @@
       $lookup[$this->key($key)] = $expire;
 
       // Attempt to store full key and value
-      if (!xcache_set($this->key($key), serialize($cache), $ttl)) {
+      if (!xcache_set($this->key($key), serialize($cacherouter), $ttl)) {
         unset($lookup[$this->key($key)]);
         $return = FALSE;
       }
       else {
         // Update static cache
-        parent::set($this->key($key), $cache);
+        parent::set($this->key($key), $cacherouter);
         $return = TRUE;
       }