diff --git a/src/Controllers/PageController.php b/src/Controllers/PageController.php
index 4b868e3..a677965 100755
--- a/src/Controllers/PageController.php
+++ b/src/Controllers/PageController.php
@@ -40,9 +40,17 @@ public function show($uri = '/')
             $page = $this->pages->findByUriOrFail($uri);
         }
 
-        request()->route()->setParameter('cache', $page->getAttribute('cache', true));
 
-        return $page->render();
+        $response = response()->make($page->render());
+
+        $cache = $page->getAttribute('cache', true);
+        request()->route()->setParameter('cache', $cache);
+
+        if ($cache) {
+            $response->setPublic()->setMaxAge(60 * 5)->setSharedMaxAge(3600 * 24 * 365);
+        }
+
+        return $response;
     }
 
     /**
diff --git a/src/Middleware/StaticCache.php b/src/Middleware/StaticCache.php
index 8657c01..312c570 100755
--- a/src/Middleware/StaticCache.php
+++ b/src/Middleware/StaticCache.php
@@ -24,13 +24,6 @@ public function handle($request, Closure $next)
         $staticCache = app('jetpages.staticCache');
         $result = $staticCache->handleRequest($request, $response);
 
-        if ($result && $response->isCacheable()) {
-            if ($response->getMaxAge() === null) {
-                $response->setExpires(new \DateTime("+1 hour"));
-            }
-            $response->setPublic();
-        }
-
         return $response;
     }