diff --git a/e107_admin/footer.php b/e107_admin/footer.php
index a02ab900a..7883704b1 100644
--- a/e107_admin/footer.php
+++ b/e107_admin/footer.php
@@ -405,10 +405,10 @@ if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
 }
 
 
-
+header("Cache-Control: must-revalidate");	// XXX testing 'always on' state for now. 
 if(!defined('e_NOCACHE'))
 {
-	header("Cache-Control: must-revalidate");	
+	// header("Cache-Control: must-revalidate");	
 }
 
 
diff --git a/e107_themes/templates/footer_default.php b/e107_themes/templates/footer_default.php
index ec67043cd..26558dd10 100644
--- a/e107_themes/templates/footer_default.php
+++ b/e107_themes/templates/footer_default.php
@@ -335,9 +335,10 @@ $etag = md5($page);
 //header('Pragma:');
 // previously disabled or there is posted data
 $canCache = e107::canCache();
+ header("Cache-Control: must-revalidate", true);	
 if($canCache && !deftrue('e_NOCACHE') && $_SERVER['REQUEST_METHOD'] === 'GET' && $_SERVER['QUERY_STRING'] != 'logout')
 {
-	header("Cache-Control: must-revalidate", true);	
+	// header("Cache-Control: must-revalidate", true);	
 	if(e107::getPref('site_page_expires')) // TODO - allow per page
 	{ 
 		if (function_exists('date_default_timezone_set'))