Index: lams_build/conf/domain.xml
===================================================================
diff -u -re57c5f124d643991b5d13901d32bc686acabe706 -r713c85b7c18fa089747d0749e09d40bc15b6b422
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision 713c85b7c18fa089747d0749e09d40bc15b6b422)
@@ -500,7 +500,7 @@
                          -->
                     </host>
                 </server>
-                <servlet-container name="default">
+                <servlet-container name="default" disable-caching-for-secured-pages="false">
                     <jsp-config x-powered-by="false" trim-spaces="true"/>
                     <websockets/>
                 </servlet-container>
Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -re57c5f124d643991b5d13901d32bc686acabe706 -r713c85b7c18fa089747d0749e09d40bc15b6b422
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 713c85b7c18fa089747d0749e09d40bc15b6b422)
@@ -479,7 +479,7 @@
                  	<access-log pattern="combined" />
                 </host>
             </server>
-            <servlet-container name="default" default-encoding="UTF-8">
+            <servlet-container name="default" default-encoding="UTF-8" disable-caching-for-secured-pages="false">
                 <jsp-config x-powered-by="false" development="true" trim-spaces="true"/>
                 <websockets/>
             </servlet-container>
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -re57c5f124d643991b5d13901d32bc686acabe706 -r713c85b7c18fa089747d0749e09d40bc15b6b422
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 713c85b7c18fa089747d0749e09d40bc15b6b422)
@@ -507,7 +507,7 @@
                  	<access-log pattern="combined" />
                 </host>
             </server>
-            <servlet-container name="default" default-encoding="UTF-8">
+            <servlet-container name="default" default-encoding="UTF-8" disable-caching-for-secured-pages="false">
                 <jsp-config x-powered-by="false" development="true" trim-spaces="true"/>
                 <websockets/>
             </servlet-container>
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java
===================================================================
diff -u -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 -r713c85b7c18fa089747d0749e09d40bc15b6b422
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java	(.../Download.java)	(revision b67c428939ed96f08f56192d54b8ee55d8ab89d2)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java	(.../Download.java)	(revision 713c85b7c18fa089747d0749e09d40bc15b6b422)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.contentrepository.client;
 
 import java.io.BufferedInputStream;
@@ -291,7 +290,7 @@
 	    Download.log.debug("Sending as inline");
 	    response.setHeader("Content-Disposition", "inline;filename=" + filename);
 	}
-	response.setHeader("Cache-control", "must-revalidate");
+	response.setHeader("Cache-control", "public, max-age=43200");
 	if (filename != null) {
 	    response.addHeader("Content-Description", filename);
 	}