diff --git a/src/Gist/Controller/Controller.php b/src/Gist/Controller/Controller.php
index ee840a7..6babb1c 100644
--- a/src/Gist/Controller/Controller.php
+++ b/src/Gist/Controller/Controller.php
@@ -196,9 +196,13 @@ abstract class Controller
 
         if (empty($params['no_cache'])) {
             $ttl = 3600 * 24 * 7;
+            $etag = sha1($response->getContent());
+
             $response->setTtl($ttl);
             $response->setClientTtl($ttl);
             $response->setExpires(new \DateTime('now +7 days'));
+            $response->setLastModified(new \DateTime('now'));
+            $response->setEtag($etag, true);
         }
 
         return $response;
diff --git a/src/Gist/Controller/MyController.php b/src/Gist/Controller/MyController.php
index 3367ffa..478ba43 100644
--- a/src/Gist/Controller/MyController.php
+++ b/src/Gist/Controller/MyController.php
@@ -130,6 +130,7 @@ class MyController extends Controller
                 'filterForm' => $filterForm->createView(),
                 'passwordForm' => $passwordForm->createView(),
                 'deleted' => !empty($deleted),
+                'no_cache' => true,
             )
         );
     }