diff --git a/core/core.services.yml b/core/core.services.yml
index 4eb462c..8d611a9 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -231,6 +231,11 @@ services:
     public: false
     tags:
       - { name: page_cache_response_policy }
+  page_cache_no_cache_non_cacheable:
+    class: Drupal\Core\PageCache\ResponsePolicy\DenyNonCacheableResponse
+    public: false
+    tags:
+      - { name: page_cache_response_policy }
   page_cache_no_server_error:
     class: Drupal\Core\PageCache\ResponsePolicy\NoServerError
     public: false
diff --git a/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNonCacheableResponse.php b/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNonCacheableResponse.php
new file mode 100644
index 0000000..fd00af7
--- /dev/null
+++ b/core/lib/Drupal/Core/PageCache/ResponsePolicy/DenyNonCacheableResponse.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\PageCache\ResponsePolicy\DenyNonCacheableResponse.
+ */
+
+namespace Drupal\Core\PageCache\ResponsePolicy;
+
+use Drupal\Core\Cache\CacheableResponse;
+use Drupal\Core\PageCache\ResponsePolicyInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * A policy denying caching of a reponse that's not a CacheableResponse
+ */
+class DenyNonCacheableResponse implements ResponsePolicyInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function check(Response $response, Request $request) {
+    if (!$response instanceof CacheableResponse) {
+      return static::DENY;
+    }
+  }
+
+}
diff --git a/core/modules/page_cache/src/StackMiddleware/PageCache.php b/core/modules/page_cache/src/StackMiddleware/PageCache.php
index ef795c4..1629c14 100644
--- a/core/modules/page_cache/src/StackMiddleware/PageCache.php
+++ b/core/modules/page_cache/src/StackMiddleware/PageCache.php
@@ -9,7 +9,6 @@
 
 use Drupal\Component\Utility\UserAgent;
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableResponse;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\PageCache\RequestPolicyInterface;
 use Drupal\Core\PageCache\ResponsePolicyInterface;
@@ -120,8 +119,7 @@ protected function pass(Request $request, $type = self::MASTER_REQUEST, $catch =
    *   A response object.
    */
   protected function lookup(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE) {
-    $response = $this->get($request);
-    if ($response instanceof CacheableResponse) {
+    if ($response = $this->get($request)) {
       $response->headers->set('X-Drupal-Cache', 'HIT');
     }
     else {