diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 46673e55..c3bad0f6 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -441,7 +441,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	 	foreach($classes as $class) $cacheCanCreate[$class] = singleton($class)->canCreate();
 
 	 	// Generate basic cache key. Too complex to encompass all variations
-	 	$cache = SS_Cache::factory('CMSMain_SiteTreeHints');
+	 	$cache = SS_Cache::factory('CMSMain_SiteTreeHints', 'Output', array('disable-segmentation' => true));
 	 	$cacheKey = md5(implode('_', array(Member::currentUserID(), implode(',', $cacheCanCreate), implode(',', $classes))));
 	 	if($this->getRequest()->getVar('flush')) $cache->clean(Zend_Cache::CLEANING_MODE_ALL);
 	 	$json = $cache->load($cacheKey);
diff --git a/tests/controller/CMSMainTest.php b/tests/controller/CMSMainTest.php
index ef961f3a..11419746 100644
--- a/tests/controller/CMSMainTest.php
+++ b/tests/controller/CMSMainTest.php
@@ -22,7 +22,7 @@ class CMSMainTest extends FunctionalTest {
 	}
 
 	function testSiteTreeHints() {
-		$cache = SS_Cache::factory('CMSMain_SiteTreeHints');
+		$cache = SS_Cache::factory('CMSMain_SiteTreeHints', 'Output', array('disable-segmentation' => true));
 		// Login as user with root creation privileges
 		$user = $this->objFromFixture('Member', 'rootedituser');
 		$user->logIn();