--- a/web/httpcache.py	Fri Nov 20 17:13:03 2015 +0100
+++ b/web/httpcache.py	Thu Nov 19 18:55:10 2015 +0100
@@ -31,6 +31,7 @@
 
     def set_headers(self):
         self.req.set_header('Cache-control', 'no-cache')
+        self.req.set_header('Expires', 'Sat, 01 Jan 2000 00:00:00 GMT')
 
 
 class MaxAgeHTTPCacheManager(NoHTTPCacheManager):
@@ -68,7 +69,7 @@
         try:
             req.set_header('Etag', '"%s"' % self.etag())
         except NoEtag:
-            self.req.set_header('Cache-control', 'no-cache')
+            super(EtagHTTPCacheManager, self).set_headers()
             return
         req.set_header('Cache-control',
                        'must-revalidate,max-age=%s' % self.max_age())