diff --git a/core/Core.php b/core/Core.php
index 1562a17ba..6d4a3acce 100755
--- a/core/Core.php
+++ b/core/Core.php
@@ -4,7 +4,8 @@
  * This is loaded into the TEMP_FOLDER define on start up
  */
 function getTempFolder() {
-	$ssTmp = dirname(dirname($_SERVER['SCRIPT_FILENAME'])) . "/silverstripe-cache";
+	$cachefolder = "silverstripe-cache" . str_replace(array("/",":", "\\"),"-", substr($_SERVER['SCRIPT_FILENAME'], 0, strlen($_SERVER['SCRIPT_FILENAME']) - strlen('/sapphire/main.php')));
+	$ssTmp = dirname(dirname($_SERVER['SCRIPT_FILENAME'])) . "/" . $cachefolder;
     if(@file_exists($ssTmp)) {
     	return $ssTmp;
     }
@@ -20,7 +21,7 @@ function getTempFolder() {
     }
 
     $worked = true;
-    $ssTmp = "$sysTmp/silverstripe-cache";
+    $ssTmp = "$sysTmp/$cachefolder";
     if(!@file_exists($ssTmp)) {
     	@$worked = mkdir($ssTmp);
     }
@@ -127,4 +128,4 @@ function _t($entity, $string = "", $priority = 40, $context = "") {
 }
 
 
-?>
\ No newline at end of file
+?>