diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index 84291ae..60e8fc8 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -18,8 +18,8 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Batch\Percentage;
 use Drupal\Core\Form\FormState;
+use Drupal\Core\Render\JsonResponse;
 use Drupal\Core\Url;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
diff --git a/core/lib/Drupal/Core/Render/JsonResponse.php b/core/lib/Drupal/Core/Render/JsonResponse.php
new file mode 100644
index 0000000..28ce9a9
--- /dev/null
+++ b/core/lib/Drupal/Core/Render/JsonResponse.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Drupal\Core\Render;
+
+use Symfony\Component\HttpFoundation\JsonResponse as SymfonyJsonResponse;
+
+/**
+ * Provides an improved JSON response class.
+ *
+ * @see \Drupal\Core\Render\ResponseTrait
+ */
+class JsonResponse extends SymfonyJsonResponse {
+
+  use ResponseTrait;
+
+}
diff --git a/core/lib/Drupal/Core/Render/Response.php b/core/lib/Drupal/Core/Render/Response.php
index aa84907..721d5e1 100644
--- a/core/lib/Drupal/Core/Render/Response.php
+++ b/core/lib/Drupal/Core/Render/Response.php
@@ -5,37 +5,12 @@
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 
 /**
- * Custom response class that uses the 'shutdown_registry' service.
+ * Provides an improved response class.
  *
- * Determines whether fastcgi_finish_request should be called depending on
- * based on whether any shutdown functions are registered.
+ * @see \Drupal\Core\Render\ResponseTrait
  */
 class Response extends SymfonyResponse {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function send() {
-    $this->sendHeaders();
-    $this->sendContent();
-
-    if (!$this->shutdownFunctionRegistered() && function_exists('fastcgi_finish_request')) {
-      fastcgi_finish_request();
-    }
-    elseif ('cli' !== PHP_SAPI) {
-      static::closeOutputBuffers(0, TRUE);
-    }
-    return $this;
-  }
-
-  /**
-   * Determines if shutdown functions are registered.
-   *
-   * @return bool
-   *   True if any shutdown functions are registered.
-   */
-  protected function shutdownFunctionRegistered() {
-    return drupal_register_shutdown_function() ? TRUE : FALSE;
-  }
+  use ResponseTrait;
 
 }
diff --git a/core/lib/Drupal/Core/Render/ResponseTrait.php b/core/lib/Drupal/Core/Render/ResponseTrait.php
new file mode 100644
index 0000000..8093c04
--- /dev/null
+++ b/core/lib/Drupal/Core/Render/ResponseTrait.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\Core\Render;
+
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
+
+/**
+ * Provides a response trait that avoid premature flushing with FastCGI.
+ *
+ * Determines whether fastcgi_finish_request should be called depending on
+ * based on whether any shutdown functions are registered.
+ *
+ * This trait should only be used by child classes of
+ * \Symfony\Component\HttpFoundation\Response.
+ */
+trait ResponseTrait {
+
+  /**
+   * Sends HTTP headers and content.
+   *
+   * @return Response
+   *
+   * @see \Symfony\Component\HttpFoundation\Response::send()
+   */
+  public function send() {
+    $this->sendHeaders();
+    $this->sendContent();
+
+    if (!$this->shutdownFunctionRegistered() && function_exists('fastcgi_finish_request')) {
+      fastcgi_finish_request();
+    }
+    elseif ('cli' !== PHP_SAPI) {
+      static::closeOutputBuffers(0, TRUE);
+    }
+    return $this;
+  }
+
+  /**
+   * Determines if shutdown functions are registered.
+   *
+   * @return bool
+   *   True if any shutdown functions are registered.
+   */
+  protected function shutdownFunctionRegistered() {
+    return drupal_register_shutdown_function() ? TRUE : FALSE;
+  }
+
+}