diff --git a/application/utils.inc.php b/application/utils.inc.php
index d843b3927..1a2941eb5 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -927,7 +927,7 @@ class utils
 	 */
 	public static function GetCachePath()
 	{
-		return APPROOT.'data/cache-'.self::GetCurrentEnvironment().'/';
+		return APPROOT.'data/cache-'.MetaModel::GetEnvironment().'/';
 	}
 	/**
 	 * Merge standard menu items with plugin provided menus items
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index e5d858401..4744d2112 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -4863,6 +4863,14 @@ abstract class MetaModel
 		return self::$m_oConfig;
 	}
 
+	/**
+	 * @return string The environment in which the model has been loaded (e.g. 'production')
+	 */
+	public static function GetEnvironment()
+	{
+		return self::$m_sEnvironment;
+	}
+
 	public static function GetEnvironmentId()
 	{
 		return md5(APPROOT).'-'.self::$m_sEnvironment;