diff --git a/lib/mshoplib/src/MShop/Locale/Manager/Default.php b/lib/mshoplib/src/MShop/Locale/Manager/Default.php
index <HASH>..<HASH> 100644
--- a/lib/mshoplib/src/MShop/Locale/Manager/Default.php
+++ b/lib/mshoplib/src/MShop/Locale/Manager/Default.php
@@ -361,6 +361,7 @@ class MShop_Locale_Manager_Default
 		}
 
 
+		// Try to find the best matching locale
 		$search = $this->createSearch( $active );
 
 		$expr = array (
diff --git a/lib/mshoplib/src/MShop/Locale/Manager/Site/Default.php b/lib/mshoplib/src/MShop/Locale/Manager/Site/Default.php
index <HASH>..<HASH> 100644
--- a/lib/mshoplib/src/MShop/Locale/Manager/Site/Default.php
+++ b/lib/mshoplib/src/MShop/Locale/Manager/Site/Default.php
@@ -406,6 +406,8 @@ class MShop_Locale_Manager_Site_Default
 			throw new MShop_Locale_Exception( sprintf( 'Tree root with code "%1$s" in "%2$s" not found', 'default', 'locale.site.code' ) );
 		}
 
+		$this->_cache[ $item->getId() ] = $item;
+
 		return $item;
 	}
Minor improvment in locale managers