Index: kernel/common/eztemplatedesignresource.php
===================================================================
--- kernel/common/eztemplatedesignresource.php	(revision 22760)
+++ kernel/common/eztemplatedesignresource.php	(working copy)
@@ -282,11 +282,18 @@
 
         eZDebug::accumulatorStart( 'override_cache', 'override', 'Cache load' );
 
-        $overrideCacheFile = $this->createOverrideCache();
+        if( !isset( $GLOBALS['eZOverrideTemplateCacheMap'] ) )
+        {
+            $overrideCacheFile = $this->createOverrideCache();
 
-        if ( $overrideCacheFile )
+            if ( $overrideCacheFile )
+            {
+                include_once( $overrideCacheFile );
+            }
+        }
+
+        if ( isset( $GLOBALS['eZOverrideTemplateCacheMap'] ) )
         {
-            include_once( $overrideCacheFile );
             if( isset( $GLOBALS['eZOverrideTemplateCacheMap'][md5( '/' . $path )] ) )
             {
                 $cacheMap = $GLOBALS['eZOverrideTemplateCacheMap'][md5( '/' . $path )];