diff --git a/src/Backend.php b/src/Backend.php
index 62ee4ff61..f5fb998b0 100644
--- a/src/Backend.php
+++ b/src/Backend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/AbstractBackend.php b/src/Backend/AbstractBackend.php
index 486ec4a4f..04a7042b8 100644
--- a/src/Backend/AbstractBackend.php
+++ b/src/Backend/AbstractBackend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/Apc.php b/src/Backend/Apc.php
index 83beae32f..19cc5d3b3 100644
--- a/src/Backend/Apc.php
+++ b/src/Backend/Apc.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/BlackHole.php b/src/Backend/BlackHole.php
index 08844abec..608795839 100644
--- a/src/Backend/BlackHole.php
+++ b/src/Backend/BlackHole.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/ExtendedBackend.php b/src/Backend/ExtendedBackend.php
index 92237c9f6..5cb0f542d 100644
--- a/src/Backend/ExtendedBackend.php
+++ b/src/Backend/ExtendedBackend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/File.php b/src/Backend/File.php
index e518e7496..1e5cbc67f 100644
--- a/src/Backend/File.php
+++ b/src/Backend/File.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/Memcached.php b/src/Backend/Memcached.php
index f76f988b5..a930706cf 100644
--- a/src/Backend/Memcached.php
+++ b/src/Backend/Memcached.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/Sqlite.php b/src/Backend/Sqlite.php
index 45aee583d..32f2d6598 100644
--- a/src/Backend/Sqlite.php
+++ b/src/Backend/Sqlite.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/StaticBackend.php b/src/Backend/StaticBackend.php
index 3637d3c8b..915eab626 100644
--- a/src/Backend/StaticBackend.php
+++ b/src/Backend/StaticBackend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/TestBackend.php b/src/Backend/TestBackend.php
index c9701fbaf..b5992c422 100644
--- a/src/Backend/TestBackend.php
+++ b/src/Backend/TestBackend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/TwoLevels.php b/src/Backend/TwoLevels.php
index d2de82a4c..d3cd99601 100644
--- a/src/Backend/TwoLevels.php
+++ b/src/Backend/TwoLevels.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/Xcache.php b/src/Backend/Xcache.php
index 0cdeab532..c66ef8bb6 100644
--- a/src/Backend/Xcache.php
+++ b/src/Backend/Xcache.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/ZendPlatform.php b/src/Backend/ZendPlatform.php
index f4ad3b0a2..e56e1a728 100644
--- a/src/Backend/ZendPlatform.php
+++ b/src/Backend/ZendPlatform.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/ZendServer/AbstractZendServer.php b/src/Backend/ZendServer/AbstractZendServer.php
index 3377cd6ad..c6c3779f9 100644
--- a/src/Backend/ZendServer/AbstractZendServer.php
+++ b/src/Backend/ZendServer/AbstractZendServer.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/ZendServer/Disk.php b/src/Backend/ZendServer/Disk.php
index 5bf2b72db..7bebc0828 100644
--- a/src/Backend/ZendServer/Disk.php
+++ b/src/Backend/ZendServer/Disk.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Backend/ZendServer/ShMem.php b/src/Backend/ZendServer/ShMem.php
index 4df4514ee..e4427e213 100644
--- a/src/Backend/ZendServer/ShMem.php
+++ b/src/Backend/ZendServer/ShMem.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Cache.php b/src/Cache.php
index 24e64d82a..5c1cf046f 100644
--- a/src/Cache.php
+++ b/src/Cache.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -103,14 +102,13 @@ abstract class Cache
      * @param array  $backendOptions  associative array of options for the corresponding backend constructor
      * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name
      * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name
-     * @param boolean $autoload if true, there will no require_once for backend and frontend (useful only for custom backends/frontends)
      * @throws \Zend\Cache\Exception
      * @return Zend\Cache\Frontend
      */
-    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false, $autoload = false)
+    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false)
     {
         if (is_string($backend)) {
-            $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming, $autoload);
+            $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming);
         } else {
             if (!is_object($backend) || !in_array('Zend\\Cache\\Backend', class_implements($backend))) {
                 self::throwException('backend must be a backend name (string) or an object which implements Zend\\Cache\\Backend');
@@ -118,7 +116,7 @@ public static function factory($frontend, $backend, $frontendOptions = array(),
             $backendObject = $backend;
         }
         if (is_string($frontend)) {
-            $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming, $autoload);
+            $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming);
         } else {
             if (!is_object($frontend) || !in_array('Zend\\Cache\\Frontend', class_implements($frontend))) {
                 self::throwException('frontend must be a frontend name (string) or an object');
@@ -135,10 +133,9 @@ public static function factory($frontend, $backend, $frontendOptions = array(),
      * @param string  $backend
      * @param array   $backendOptions
      * @param boolean $customBackendNaming
-     * @param boolean $autoload
      * @return \Zend\Cache\Backend
      */
-    public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false, $autoload = false)
+    public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false)
     {
         if (!$customBackendNaming) {
             $backend  = self::_normalizeName($backend);
@@ -146,8 +143,6 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam
         if (in_array($backend, self::$standardBackends)) {
             // we use a standard backend
             $backendClass = 'Zend\Cache\Backend\\' . $backend;
-            // security controls are explicit
-            require_once str_replace('\\', DIRECTORY_SEPARATOR, $backendClass) . '.php';
         } else {
             // we use a custom backend
             if (!preg_match('~^[\w\\\\]+$~D', $backend)) {
@@ -159,13 +154,6 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam
             } else {
                 $backendClass = $backend;
             }
-            if (!$autoload) {
-                $file = str_replace('\\', DIRECTORY_SEPARATOR, $backendClass) . '.php';
-                if (!(self::_isReadable($file))) {
-                    self::throwException("file $file not found in include_path");
-                }
-                require_once $file;
-            }
         }
         $backend = new $backendClass($backendOptions);
         if (!$backend instanceof Backend) {
@@ -180,10 +168,9 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam
      * @param string  $frontend
      * @param array   $frontendOptions
      * @param boolean $customFrontendNaming
-     * @param boolean $autoload
      * @return Zend_Cache_Core|Zend_Cache_Frontend
      */
-    public static function _makeFrontend($frontend, $frontendOptions = array(), $customFrontendNaming = false, $autoload = false)
+    public static function _makeFrontend($frontend, $frontendOptions = array(), $customFrontendNaming = false)
     {
         if (!$customFrontendNaming) {
             $frontend = self::_normalizeName($frontend);
@@ -192,8 +179,6 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus
             // we use a standard frontend
             // For perfs reasons, with frontend == 'Core', we can interact with the Core itself
             $frontendClass = 'Zend\Cache\Frontend\\' . $frontend;
-            // security controls are explicit
-            require_once str_replace('\\', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
         } else {
             // we use a custom frontend
             if (!preg_match('~^[\w\\\\]+$~D', $frontend)) {
@@ -205,13 +190,6 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus
             } else {
                 $frontendClass = $frontend;
             }
-            if (!$autoload) {
-                $file = str_replace('\\', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
-                if (!(self::_isReadable($file))) {
-                    self::throwException("file $file not found in include_path");
-                }
-                require_once $file;
-            }
         }
         $frontend = new $frontendClass($frontendOptions);
         if (!$frontend instanceof Frontend) {
diff --git a/src/Exception.php b/src/Exception.php
index fcb1ba2a2..deff27e0d 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Frontend.php b/src/Frontend.php
index 084ff333a..ac7e3c642 100644
--- a/src/Frontend.php
+++ b/src/Frontend.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Frontend/Capture.php b/src/Frontend/Capture.php
index 228f8f5fa..89bcd7671 100644
--- a/src/Frontend/Capture.php
+++ b/src/Frontend/Capture.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Frontend/ClassFrontend.php b/src/Frontend/ClassFrontend.php
index 3209cb744..68f016bbd 100644
--- a/src/Frontend/ClassFrontend.php
+++ b/src/Frontend/ClassFrontend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Frontend/Core.php b/src/Frontend/Core.php
index d7082190c..64831b7d6 100644
--- a/src/Frontend/Core.php
+++ b/src/Frontend/Core.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Frontend/File.php b/src/Frontend/File.php
index 1ceb044b9..264921bb2 100644
--- a/src/Frontend/File.php
+++ b/src/Frontend/File.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Frontend/FunctionFrontend.php b/src/Frontend/FunctionFrontend.php
index 3071b3657..799407a17 100644
--- a/src/Frontend/FunctionFrontend.php
+++ b/src/Frontend/FunctionFrontend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Frontend/Output.php b/src/Frontend/Output.php
index 47ed6b919..23a21ce04 100644
--- a/src/Frontend/Output.php
+++ b/src/Frontend/Output.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Frontend/Page.php b/src/Frontend/Page.php
index 55ab6d449..03f2faf40 100644
--- a/src/Frontend/Page.php
+++ b/src/Frontend/Page.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Manager.php b/src/Manager.php
index a4b377178..2cca1ed63 100644
--- a/src/Manager.php
+++ b/src/Manager.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/ApcBackendTest.php b/test/ApcBackendTest.php
index dd97c4132..439480968 100644
--- a/test/ApcBackendTest.php
+++ b/test/ApcBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/ClassFrontendTest.php b/test/ClassFrontendTest.php
index db07b2835..ed8a4b8d7 100644
--- a/test/ClassFrontendTest.php
+++ b/test/ClassFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/CoreTest.php b/test/CoreTest.php
index 4e28473b4..eed32904b 100644
--- a/test/CoreTest.php
+++ b/test/CoreTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/FactoryException.php b/test/FactoryException.php
index bf94ce6c1..6b273c932 100644
--- a/test/FactoryException.php
+++ b/test/FactoryException.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/FactoryTest.php b/test/FactoryTest.php
index 65fcb52ab..8b2320c9b 100644
--- a/test/FactoryTest.php
+++ b/test/FactoryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/FileBackendTest.php b/test/FileBackendTest.php
index 24bcbb927..d1f46f409 100644
--- a/test/FileBackendTest.php
+++ b/test/FileBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/FileFrontendTest.php b/test/FileFrontendTest.php
index 32de1b6a9..8d83446bf 100644
--- a/test/FileFrontendTest.php
+++ b/test/FileFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/FunctionFrontendTest.php b/test/FunctionFrontendTest.php
index 02dd9293c..c9548725d 100644
--- a/test/FunctionFrontendTest.php
+++ b/test/FunctionFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/ManagerTest.php b/test/ManagerTest.php
index 50dd8f7b2..45dc37048 100644
--- a/test/ManagerTest.php
+++ b/test/ManagerTest.php
@@ -16,7 +16,6 @@
  * @package    UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/MemcachedBackendTest.php b/test/MemcachedBackendTest.php
index f5e0324e1..b6ddccbc3 100644
--- a/test/MemcachedBackendTest.php
+++ b/test/MemcachedBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/OutputFrontendTest.php b/test/OutputFrontendTest.php
index ddd95fa5f..7bbf0c8d9 100644
--- a/test/OutputFrontendTest.php
+++ b/test/OutputFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/PageFrontendTest.php b/test/PageFrontendTest.php
index db070ab96..c962b138a 100644
--- a/test/PageFrontendTest.php
+++ b/test/PageFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/SkipTests.php b/test/SkipTests.php
index 44d04175f..cf0339c38 100644
--- a/test/SkipTests.php
+++ b/test/SkipTests.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/SqliteBackendTest.php b/test/SqliteBackendTest.php
index d45581a3f..cc21642b0 100644
--- a/test/SqliteBackendTest.php
+++ b/test/SqliteBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/TestCommonBackend.php b/test/TestCommonBackend.php
index 08a169431..113056971 100644
--- a/test/TestCommonBackend.php
+++ b/test/TestCommonBackend.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/TestCommonExtendedBackend.php b/test/TestCommonExtendedBackend.php
index 0db9f05a1..d80a38e40 100644
--- a/test/TestCommonExtendedBackend.php
+++ b/test/TestCommonExtendedBackend.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/TwoLevelsBackendTest.php b/test/TwoLevelsBackendTest.php
index db8169f87..d66491d67 100644
--- a/test/TwoLevelsBackendTest.php
+++ b/test/TwoLevelsBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/XcacheBackendTest.php b/test/XcacheBackendTest.php
index 65a3e6d56..66d714d82 100644
--- a/test/XcacheBackendTest.php
+++ b/test/XcacheBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/ZendPlatformBackendTest.php b/test/ZendPlatformBackendTest.php
index f68bc1f6b..0380a59e0 100644
--- a/test/ZendPlatformBackendTest.php
+++ b/test/ZendPlatformBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/ZendServerDiskTest.php b/test/ZendServerDiskTest.php
old mode 100755
new mode 100644
index 80e342ec3..d7ce79190
--- a/test/ZendServerDiskTest.php
+++ b/test/ZendServerDiskTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;
diff --git a/test/ZendServerShMemTest.php b/test/ZendServerShMemTest.php
old mode 100755
new mode 100644
index e08dc4746..c6f40e9b7
--- a/test/ZendServerShMemTest.php
+++ b/test/ZendServerShMemTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;