diff --git a/.hgsubstate b/.hgsubstate
index e0b2e9139..409753316 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,5 +1,5 @@
-eb12bf266fcd8334b7a20d7553dd28f9c80dfa07 src/Orchard.Web/Modules/Orchard.Forms
-1e253917ef6ea7f0803ef8425c42c1db148aab1d src/Orchard.Web/Modules/Orchard.Projections
-7e6e3d2e72d94c3f78e8aecc0aa87ede108226bd src/Orchard.Web/Modules/Orchard.Rules
-c6098ad6c3fdb614901e8946d8e298e3c50f3ea1 src/Orchard.Web/Modules/Orchard.TaskLease
-4c4fd36df9d1337c0b6801960d02221debcf4388 src/Orchard.Web/Modules/Orchard.Tokens
+67bf9897ee9dd9483369aece729ad7c6f042941c src/Orchard.Web/Modules/Orchard.Forms
+b74a729568b3e8815f30b6b2c6b08e71af106ec4 src/Orchard.Web/Modules/Orchard.Projections
+75b2107eb093154b35832e3ea6e8514d4a66426a src/Orchard.Web/Modules/Orchard.Rules
+ce578373f907c0a55fd91229a344f0755f290174 src/Orchard.Web/Modules/Orchard.TaskLease
+cf73534c335f39e6d9695c2a0ce64c426d1be9f2 src/Orchard.Web/Modules/Orchard.Tokens
diff --git a/src/Orchard.Web/Core/Common/Styles/Web.config b/src/Orchard.Web/Core/Common/Styles/Web.config
index 0dc62ece6..56fa41e3e 100644
--- a/src/Orchard.Web/Core/Common/Styles/Web.config
+++ b/src/Orchard.Web/Core/Common/Styles/Web.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
+<configuration>
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
   </appSettings>
   <system.web>
     <httpHandlers>
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Core/Contents/Styles/Web.config b/src/Orchard.Web/Core/Contents/Styles/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Core/Contents/Styles/Web.config
+++ b/src/Orchard.Web/Core/Contents/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Core/Dashboard/styles/Web.config b/src/Orchard.Web/Core/Dashboard/styles/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Core/Dashboard/styles/Web.config
+++ b/src/Orchard.Web/Core/Dashboard/styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Core/Navigation/Styles/Web.config b/src/Orchard.Web/Core/Navigation/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Core/Navigation/Styles/Web.config
+++ b/src/Orchard.Web/Core/Navigation/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Core/Reports/Styles/Web.config b/src/Orchard.Web/Core/Reports/Styles/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Core/Reports/Styles/Web.config
+++ b/src/Orchard.Web/Core/Reports/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Core/Routable/Scripts/Web.config b/src/Orchard.Web/Core/Routable/Scripts/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Core/Routable/Scripts/Web.config
+++ b/src/Orchard.Web/Core/Routable/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Core/Settings/Styles/Web.config b/src/Orchard.Web/Core/Settings/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Core/Settings/Styles/Web.config
+++ b/src/Orchard.Web/Core/Settings/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Core/Shapes/Scripts/Web.config b/src/Orchard.Web/Core/Shapes/Scripts/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Core/Shapes/Scripts/Web.config
+++ b/src/Orchard.Web/Core/Shapes/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Core/Shapes/Styles/Web.config b/src/Orchard.Web/Core/Shapes/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Core/Shapes/Styles/Web.config
+++ b/src/Orchard.Web/Core/Shapes/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Media/web.config b/src/Orchard.Web/Media/web.config
index df1c33504..c964db718 100644
--- a/src/Orchard.Web/Media/web.config
+++ b/src/Orchard.Web/Media/web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+    
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Markdown/Content/Web.config b/src/Orchard.Web/Modules/Markdown/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Markdown/Content/Web.config
+++ b/src/Orchard.Web/Modules/Markdown/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/Web.config b/src/Orchard.Web/Modules/Markdown/Scripts/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Markdown/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Markdown/Styles/Web.config b/src/Orchard.Web/Modules/Markdown/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Markdown/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Markdown/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/StaticFilesWebConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/StaticFilesWebConfig.txt
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/StaticFilesWebConfig.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/StaticFilesWebConfig.txt
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Comments/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/Web.config
index 178ff35ba..770adfab5 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/Styles/Web.config
index 178ff35ba..770adfab5 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Experimental/Styles/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.ImportExport/Styles/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.Lists/Scripts/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Lists/Styles/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Localization/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Media/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Media/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Content/Web.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/Content/Web.config
index 178ff35ba..770adfab5 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/Web.config
index 178ff35ba..770adfab5 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/Web.config
index 178ff35ba..770adfab5 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Modules/styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Content/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Pages/Styles/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Content/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Content/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Search/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Scripts/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Users/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Users/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Warmup/Content/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Modules/Orchard.Warmup/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Warmup/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.Warmup/Scripts/Web.config
index 178ff35ba..770adfab5 100644
--- a/src/Orchard.Web/Modules/Orchard.Warmup/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Warmup/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Warmup/Styles/Web.config
index 178ff35ba..770adfab5 100644
--- a/src/Orchard.Web/Modules/Orchard.Warmup/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Warmup/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Content/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Content/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Styles/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Styles/images/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Styles/images/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Styles/images/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Styles/images/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/Web.config b/src/Orchard.Web/Modules/TinyMce/Scripts/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Modules/TinyMce/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/Web.config b/src/Orchard.Web/Themes/SafeMode/Content/Web.config
index 0dc62ece6..c7d2cbebe 100644
--- a/src/Orchard.Web/Themes/SafeMode/Content/Web.config
+++ b/src/Orchard.Web/Themes/SafeMode/Content/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/Web.config b/src/Orchard.Web/Themes/SafeMode/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Themes/SafeMode/Styles/Web.config
+++ b/src/Orchard.Web/Themes/SafeMode/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/Web.config b/src/Orchard.Web/Themes/TheAdmin/Scripts/Web.config
index 0dc62ece6..c964db718 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Scripts/Web.config
+++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/Web.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
+<configuration>
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
   </appSettings>
   <system.web>
     <httpHandlers>
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+    
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/Web.config b/src/Orchard.Web/Themes/TheAdmin/Styles/Web.config
index 0dc62ece6..c964db718 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/Web.config
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/Web.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
+<configuration>
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
   </appSettings>
   <system.web>
     <httpHandlers>
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+    
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Web.config b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Web.config
index df1c33504..56fa41e3e 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Web.config
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Web.config
@@ -10,6 +10,10 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
+    </staticContent>
+
     <handlers accessPolicy="Script,Read">
       <!--
       iis7 - for any request to a file exists on disk, return it via native http module.