Index: branches/5.1.x/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r13086 -r13168
--- branches/5.1.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 13086)
+++ branches/5.1.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 13168)
@@ -109,6 +109,13 @@
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" allow_html="0" control_options="{min_height: 50}" rows="3" cols="70"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" allow_html="0" control_options="{min_height: 50}" rows="4" cols="70"/>
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="IndexTools" title="!la_fld_TrackingCode!" control_options="{min_height: 50}" allow_html="0"/>
+
+		<inp2:m_RenderElement name="subsection" prefix="c" fields="EnablePageCache,OverridePageCacheKey,PageCacheKey,PageExpiration" title="la_section_PageCaching"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EnablePageCache" title="la_fld_EnablePageCache" onclick="reflectCachingSettings();"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="OverridePageCacheKey" title="la_fld_OverridePageCacheKey" onclick="reflectCacheKeyOverride();"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="PageCacheKey" title="la_fld_PageCacheKey"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="PageExpiration" title="la_fld_PageExpiration" hint_label="la_hint_PageExpiration"/>
+
 		<!-- custom fields: begin -->
 		<inp2:m_include t="incs/custom_blocks"/>
 		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
@@ -168,17 +175,42 @@
 	function reflectFilename() {
 		var $filename = getControl('Filename');
 		if ($filename) {
-	    	var $checked = getControl('AutomaticFilename', null, '_cb').checked;
-	    	$filename.readOnly = $checked;
+			var $checked = getControl('AutomaticFilename', null, '_cb').checked;
+			$filename.readOnly = $checked;
 		}
     }
 
+    function reflectCachingSettings() {
+		var $checked = getControl('EnablePageCache', null, '_cb').checked;
+
+		getControl('OverridePageCacheKey', null, '_cb').disabled = !$checked;
+		getControl('PageCacheKey').disabled = !$checked || !getControl('OverridePageCacheKey', null, '_cb').checked;
+//		getControl('PageExpiration').disabled = !$checked;
+    }
+
+    function reflectCacheKeyOverride() {
+		var $checked = getControl('OverridePageCacheKey', null, '_cb').checked;
+		getControl('PageCacheKey').disabled = !$checked;
+    }
+
+    Application.setHook(
+    	'c:*',
+    	function () {
+    		getControl('OverridePageCacheKey', null, '_cb').disabled = false;
+			getControl('PageCacheKey').disabled = false;
+//			getControl('PageExpiration').disabled = false;
+    	}
+    );
+
 	$(document).ready(
 		function() {
 			reflectMenuIcon();
 			reflectExternalUrl();
 			reflectFilename();
-//			OnSystemClick();
+			// OnSystemClick();
+
+			reflectCacheKeyOverride();
+			reflectCachingSettings();
 		}
 	);
 </script>