Index: index.php
===================================================================
--- index.php	(revision 22598)
+++ index.php	(working copy)
@@ -412,6 +412,12 @@
     $GLOBALS['eZSessionFunctions']['empty_pre'][] = 'eZSessionBasketEmpty';
 }
 
+$lang = eZPreferences::value( 'lang' );
+if ( $lang )
+{
+    $GLOBALS["eZLocaleStringDefault"] = $lang;
+}
+
 // Initialize module loading
 $moduleRepositories = eZModule::activeModuleRepositories();
 eZModule::setGlobalPathList( $moduleRepositories );
Index: kernel/classes/eznodeviewfunctions.php
===================================================================
--- kernel/classes/eznodeviewfunctions.php	(revision 22599)
+++ kernel/classes/eznodeviewfunctions.php	(working copy)
@@ -327,7 +327,7 @@
             $cacheHashArray[] = $pString;
         }
 
-        $cacheFile = $nodeID . '-' . $cacheNameExtra . md5( implode( '-', $cacheHashArray ) ) . '.cache';
+        $cacheFile = $nodeID . '-' . $cacheNameExtra . eZLocale::instance()->translationCode() . '-' . md5( implode( '-', $cacheHashArray ) ) . '.cache';
         $extraPath = eZDir::filenamePath( $nodeID );
         $cacheDir = eZDir::path( array( eZSys::cacheDirectory(), $ini->variable( 'ContentSettings', 'CacheDir' ), $currentSiteAccess, $extraPath ) );
         $cachePath = eZDir::path( array( $cacheDir, $cacheFile ) );
Index: lib/ezi18n/classes/eztranslationcache.php
===================================================================
--- lib/ezi18n/classes/eztranslationcache.php	(revision 22598)
+++ lib/ezi18n/classes/eztranslationcache.php	(working copy)
@@ -107,8 +107,7 @@
         $cacheDirectory =& $GLOBALS['eZTranslationCacheDirectory'];
         if ( !isset( $cacheDirectory ) )
         {
-            $ini = eZINI::instance();
-            $locale = $ini->variable( 'RegionalSettings', 'Locale' );
+            $locale = eZLocale::instance()->translationCode();
 
             $rootCacheDirectory = eZTranslationCache::rootCacheDirectory();
             $cacheDirectory = eZDir::path( array( $rootCacheDirectory, $locale ) );