diff --git a/src/Resources/contao/classes/FrontendTemplate.php b/src/Resources/contao/classes/FrontendTemplate.php
index 9ecd12cc80..c85892810e 100644
--- a/src/Resources/contao/classes/FrontendTemplate.php
+++ b/src/Resources/contao/classes/FrontendTemplate.php
@@ -374,8 +374,11 @@ private function setCacheHeaders(Response $response)
 		/** @var $objPage \PageModel */
 		global $objPage;
 
-		if (($objPage->cache === false || $objPage->cache === 0) && ($objPage->clientCache === false || $objPage->clientCache === 0))
+		if (($objPage->cache === false || $objPage->cache < 1) && ($objPage->clientCache === false || $objPage->clientCache < 1))
 		{
+			$response->headers->addCacheControlDirective('no-cache');
+			$response->headers->addCacheControlDirective('no-store');
+
 			return $response->setPrivate();
 		}
 
@@ -383,6 +386,9 @@ private function setCacheHeaders(Response $response)
 		// TODO: Add support for proxies so they can vary on member context
 		if (FE_USER_LOGGED_IN === true || BE_USER_LOGGED_IN === true || $objPage->protected || $this->hasAuthenticatedBackendUser())
 		{
+			$response->headers->addCacheControlDirective('no-cache');
+			$response->headers->addCacheControlDirective('no-store');
+
 			return $response->setPrivate();
 		}