diff --git a/core/core.services.yml b/core/core.services.yml
index f00c450..51a8a11 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -45,6 +45,13 @@ services:
     factory_method: get
     factory_service: cache_factory
     arguments: [field]
+  cache.form:
+    class: Drupal\Core\Cache\CacheBackendInterface
+    tags:
+      - { name: cache.bin }
+    factory_method: get
+    factory_service: cache_factory
+    arguments: [form]
   cache.menu:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
@@ -108,7 +115,7 @@ services:
     arguments: [default]
   form_builder:
     class: Drupal\Core\Form\FormBuilder
-    arguments: ['@module_handler', '@keyvalue.expirable', '@event_dispatcher', '@url_generator', '@string_translation', '@?csrf_token', '@?http_kernel']
+    arguments: ['@module_handler', '@keyvalue.expirable', '@cache.form', '@event_dispatcher', '@url_generator', '@string_translation', '@?csrf_token', '@?http_kernel']
     calls:
       - [setRequest, ['@?request']]
   keyvalue:
diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc
index de6f5d0..8213055 100644
--- a/core/includes/ajax.inc
+++ b/core/includes/ajax.inc
@@ -382,7 +382,7 @@ function ajax_prepare_response($page_callback_result) {
 function ajax_process_form($element, &$form_state) {
   $element = ajax_pre_render_element($element);
   if (!empty($element['#ajax_processed'])) {
-    $form_state['cache'] = TRUE;
+    $form_state['persist'] = TRUE;
   }
   return $element;
 }
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 5d4a943..f7e9739 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -131,33 +131,6 @@ function form_state_defaults() {
 }
 
 /**
- * Constructs a new $form from the information in $form_state.
- *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->rebuildForm()
- */
-function drupal_rebuild_form($form_id, &$form_state, $old_form = NULL) {
-  return \Drupal::formBuilder()->rebuildForm($form_id, $form_state, $old_form);
-}
-
-/**
- * Fetches a form from the cache.
- *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->getCache()
- */
-function form_get_cache($form_build_id, &$form_state) {
-  return \Drupal::formBuilder()->getCache($form_build_id, $form_state);
-}
-
-/**
- * Stores a form in the cache.
- *
- * @deprecated as of Drupal 8.0. Use \Drupal::formBuilder()->setCache()
- */
-function form_set_cache($form_build_id, $form, $form_state) {
-  \Drupal::formBuilder()->setCache($form_build_id, $form, $form_state);
-}
-
-/**
  * Ensures an include file is loaded whenever the form is processed.
  *
  * Example:
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 24d3269..7e9d928 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -397,7 +397,7 @@ function install_begin_request(&$install_state) {
     // Register the translation services.
     install_register_translation_service($container);
 
-    foreach (array('bootstrap', 'config', 'cache', 'menu', 'page', 'path') as $bin) {
+    foreach (array('bootstrap', 'config', 'cache', 'form', 'menu', 'page', 'path') as $bin) {
       $container
         ->register("cache.$bin", 'Drupal\Core\Cache\MemoryBackend')
         ->addArgument($bin);
@@ -453,6 +453,7 @@ function install_begin_request(&$install_state) {
     $container->register('form_builder', 'Drupal\Core\Form\FormBuilder')
       ->addArgument(new Reference('module_handler'))
       ->addArgument(new Reference('keyvalue.expirable'))
+      ->addArgument(new Reference('cache.form'))
       ->addArgument(new Reference('event_dispatcher'))
       ->addArgument(new Reference('url_generator'))
       ->addArgument(new Reference('string_translation'))
diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index 43d15a6..f5957d7 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -12,6 +12,7 @@
 use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\Url;
 use Drupal\Core\Access\CsrfTokenGenerator;
+use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\HttpKernel;
 use Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface;
@@ -46,6 +47,13 @@ class FormBuilder implements FormBuilderInterface {
   protected $keyValueExpirableFactory;
 
   /**
+   * The cache backend for the form cache.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface
+   */
+  protected $formCache;
+
+  /**
    * The event dispatcher.
    *
    * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
@@ -125,6 +133,8 @@ class FormBuilder implements FormBuilderInterface {
    *   The module handler.
    * @param \Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface $key_value_expirable_factory
    *   The keyvalue expirable factory.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $form_cache
+   *   The cache backend for the form cache.
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
    *   The event dispatcher.
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
@@ -136,9 +146,10 @@ class FormBuilder implements FormBuilderInterface {
    * @param \Drupal\Core\HttpKernel $http_kernel
    *   The HTTP kernel.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, KeyValueExpirableFactoryInterface $key_value_expirable_factory, EventDispatcherInterface $event_dispatcher, UrlGeneratorInterface $url_generator, TranslationInterface $translation_manager, CsrfTokenGenerator $csrf_token = NULL, HttpKernel $http_kernel = NULL) {
+  public function __construct(ModuleHandlerInterface $module_handler, KeyValueExpirableFactoryInterface $key_value_expirable_factory, CacheBackendInterface $form_cache, EventDispatcherInterface $event_dispatcher, UrlGeneratorInterface $url_generator, TranslationInterface $translation_manager, CsrfTokenGenerator $csrf_token = NULL, HttpKernel $http_kernel = NULL) {
     $this->moduleHandler = $module_handler;
     $this->keyValueExpirableFactory = $key_value_expirable_factory;
+    $this->formCache = $form_cache;
     $this->eventDispatcher = $event_dispatcher;
     $this->urlGenerator = $url_generator;
     $this->translationManager = $translation_manager;
@@ -191,7 +202,7 @@ public function getForm($form_arg) {
   /**
    * {@inheritdoc}
    */
-  public function buildForm($form_id, array &$form_state) {
+  public function buildForm($form_id, array &$form_state, $process = TRUE) {
     // Ensure some defaults; if already set they will not be overridden.
     $form_state += $this->getFormStateDefaults();
 
@@ -207,7 +218,9 @@ public function buildForm($form_id, array &$form_state) {
       // already been processed, but needs to be rebuilt. See _batch_finished().
       $form_state = $_SESSION['batch_form_state'];
       unset($_SESSION['batch_form_state']);
-      return $this->rebuildForm($form_id, $form_state);
+      $form = $this->rebuildForm($form_id, $form_state);
+      $form = $this->doBuildForm($form_id, $form, $form_state);
+      return $form;
     }
 
     // If the incoming input contains a form_build_id, we'll check the cache for
@@ -217,7 +230,7 @@ public function buildForm($form_id, array &$form_state) {
     // processing code.
     $check_cache = isset($form_state['input']['form_id']) && $form_state['input']['form_id'] == $form_id && !empty($form_state['input']['form_build_id']);
     if ($check_cache) {
-      $form = $this->getCache($form_state['input']['form_build_id'], $form_state);
+      $form = $this->loadState($form_state['input']['form_build_id'], $form_state);
     }
 
     // If the previous bit of code didn't result in a populated $form object, we
@@ -234,14 +247,14 @@ public function buildForm($form_id, array &$form_state) {
       $form = $this->retrieveForm($form_id, $form_state);
       $this->prepareForm($form_id, $form, $form_state);
 
-      // self::setCache() removes uncacheable $form_state keys defined in
+      // self::saveState() removes unpersistable $form_state keys defined in
       // self::getUncacheableKeys() in order for multi-step forms to work
       // properly. This means that form processing logic for single-step forms
-      // using $form_state['cache'] may depend on data stored in those keys
-      // during self::retrieveForm()/self::prepareForm(), but form
-      // processing should not depend on whether the form is cached or not, so
-      // $form_state is adjusted to match what it would be after a
-      // self::setCache()/self::getCache() sequence. These exceptions are
+      // using $form_state['persist'] may depend on data stored in those keys
+      // during self::retrieveForm()/self::prepareForm(), but because the form
+      // state is expirable, form processing logic should not vary based on
+      // that, so we adjust $form_state to match what it would be after a
+      // self::saveState()/self::loadState() sequence. These exceptions are
       // allowed to survive here:
       // - always_process: Does not make sense in conjunction with form caching
       //   in the first place, since passing form_build_id as a GET parameter is
@@ -255,6 +268,10 @@ public function buildForm($form_id, array &$form_state) {
       }
     }
 
+    if (!$process) {
+      return $form;
+    }
+
     // Now that we have a constructed form, process it. This is where:
     // - Element #process functions get called to further refine $form.
     // - User input, if any, gets incorporated in the #value property of the
@@ -303,7 +320,8 @@ public function getFormStateDefaults() {
       'submitted' => FALSE,
       'executed' => FALSE,
       'programmed' => FALSE,
-      'cache'=> FALSE,
+      'persist' => FALSE,
+      'cache_form' => FALSE,
       'method' => 'post',
       'groups' => array(),
       'buttons' => array(),
@@ -341,47 +359,39 @@ public function rebuildForm($form_id, &$form_state, $old_form = NULL) {
 
     $this->prepareForm($form_id, $form, $form_state);
 
-    // Caching is normally done in self::processForm(), but what needs to be
-    // cached is the $form structure before it passes through
-    // self::doBuildForm(), so we need to do it here.
-    // @todo For Drupal 8, find a way to avoid this code duplication.
-    if (empty($form_state['no_cache'])) {
-      $this->setCache($form['#build_id'], $form, $form_state);
-    }
-
     // Clear out all group associations as these might be different when
     // re-rendering the form.
     $form_state['groups'] = array();
 
-    // Return a fully built form that is ready for rendering.
-    return $this->doBuildForm($form_id, $form, $form_state);
+    return $form;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getCache($form_build_id, &$form_state) {
-    if ($form = $this->keyValueExpirableFactory->get('form')->get($form_build_id)) {
+  public function loadState($form_build_id, &$form_state) {
+    $stored_form_state = $this->keyValueExpirableFactory->get('form_state')->get($form_build_id);
+    if (isset($stored_form_state)) {
       $user = $this->currentUser();
-      if ((isset($form['#cache_token']) && $this->csrfToken->validate($form['#cache_token'])) || (!isset($form['#cache_token']) && $user->isAnonymous())) {
-        if ($stored_form_state = $this->keyValueExpirableFactory->get('form_state')->get($form_build_id)) {
-          // Re-populate $form_state for subsequent rebuilds.
-          $form_state = $stored_form_state + $form_state;
-
-          // If the original form is contained in include files, load the files.
-          // @see form_load_include()
-          $form_state['build_info'] += array('files' => array());
-          foreach ($form_state['build_info']['files'] as $file) {
-            if (is_array($file)) {
-              $file += array('type' => 'inc', 'name' => $file['module']);
-              $this->moduleHandler->loadInclude($file['module'], $file['type'], $file['name']);
-            }
-            elseif (file_exists($file)) {
-              require_once DRUPAL_ROOT . '/' . $file;
-            }
+      if ((isset($stored_form_state['csrf_token']) && $this->csrfToken->validate($stored_form_state['csrf_token'])) || (!isset($stored_form_state['csrf_token']) && $user->isAnonymous())) {
+        $form_state = $stored_form_state + $form_state;
+
+        // If the original form is contained in include files, load the files.
+        // @see form_load_include()
+        $form_state['build_info'] += array('files' => array());
+        foreach ($form_state['build_info']['files'] as $file) {
+          if (is_array($file)) {
+            $file += array('type' => 'inc', 'name' => $file['module']);
+            $this->moduleHandler->loadInclude($file['module'], $file['type'], $file['name']);
+          }
+          elseif (file_exists($file)) {
+            require_once DRUPAL_ROOT . '/' . $file;
           }
         }
-        return $form;
+
+        if ($form = $this->formCache->get($form_build_id)) {
+          return $form->data;
+        }
       }
     }
   }
@@ -389,21 +399,20 @@ public function getCache($form_build_id, &$form_state) {
   /**
    * {@inheritdoc}
    */
-  public function setCache($form_build_id, $form, $form_state) {
+  public function saveState($form_build_id, $form, $form_state) {
     // 6 hours cache life time for forms should be plenty.
     $expire = 21600;
 
-    // Cache form structure.
-    if (isset($form)) {
-      if ($this->currentUser()->isAuthenticated()) {
-        $form['#cache_token'] = $this->csrfToken->get();
-      }
-      $this->keyValueExpirableFactory->get('form')->setWithExpire($form_build_id, $form, $expire);
+    // Persist the form state.
+    $data = array_diff_key($form_state, array_flip($this->getUncacheableKeys()));
+    if ($this->currentUser()->isAuthenticated()) {
+      $data['csrf_token'] = $this->csrfToken->get();
     }
+    $this->keyValueExpirableFactory->get('form_state')->setWithExpire($form_build_id, $data, $expire);
 
-    // Cache form state.
-    if ($data = array_diff_key($form_state, array_flip($this->getUncacheableKeys()))) {
-      $this->keyValueExpirableFactory->get('form_state')->setWithExpire($form_build_id, $data, $expire);
+    // Cache the form structure.
+    if ($form_state['cache_form']) {
+      $this->formCache->set($form_build_id, $form, REQUEST_TIME + $expire);
     }
   }
 
@@ -683,18 +692,21 @@ public function processForm($form_id, &$form, &$form_state) {
         // context of a rebuild, so ensure it is set.
         $form_state['rebuild'] = TRUE;
         $form = $this->rebuildForm($form_id, $form_state, $form);
+        $unprocessed_form = $form;
+        $form = $this->doBuildForm($form_id, $form, $form_state);
+        $form_state['persist'] = TRUE;
       }
     }
 
     // After processing the form, the form builder or a #process callback may
-    // have set $form_state['cache'] to indicate that the form and form state
-    // shall be cached. But the form may only be cached if the 'no_cache'
-    // property is not set to TRUE. Only cache $form as it was prior to
-    // self::doBuildForm(), because self::doBuildForm() must run for each
-    // request to accommodate new user input. Rebuilt forms are not cached here,
-    // because self::rebuildForm() already takes care of that.
-    if (!$form_state['rebuild'] && $form_state['cache'] && empty($form_state['no_cache'])) {
-      $this->setCache($form['#build_id'], $unprocessed_form, $form_state);
+    // have set $form_state['persist'] to indicate that the form state shall be
+    // persisted. But the form state may only be persisted if the 'no_persist'
+    // property is not set to TRUE. self::saveState() also caches $form if
+    // $form_state['cache_form'] is TRUE, but we must only cache $form as it was
+    // prior to self::doBuildForm(), because self::doBuildForm() must run for
+    // each request to accommodate new user input.
+    if ($form_state['persist'] && empty($form_state['no_persist'])) {
+      $this->saveState($form['#build_id'], $unprocessed_form, $form_state);
     }
   }
 
diff --git a/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
index ad6febf..8da0616 100644
--- a/core/lib/Drupal/Core/Form/FormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
@@ -92,7 +92,7 @@ public function getForm($form_arg);
    *       loaded for building the form. Each array entry may be the path to a
    *       file or another array containing values for the parameters 'type',
    *       'module' and 'name' as needed by module_load_include(). The files
-   *       listed here are automatically loaded by form_get_cache(). By default
+   *       listed here are automatically loaded by self::loadState(). By default
    *       the current menu router item's 'file' definition is added, if any.
    *       Use form_load_include() to add include files from a form constructor.
    *     - form_id: Identification of the primary form being constructed and
@@ -125,24 +125,34 @@ public function getForm($form_arg);
    *     submitted, which can have unexpected effects. The 'get' method should
    *     only be used on forms that do not change data, as that is exclusively
    *     the domain of 'post.'
-   *   - cache: If set to TRUE the original, unprocessed form structure will be
-   *     cached, which allows the entire form to be rebuilt from cache. A
-   *     typical form workflow involves two page requests; first, a form is
+   *   - persist: If set to TRUE, the $form_state at the end of
+   *     self::processForm() gets saved and reloaded when the form is submitted.
+   *     A typical form workflow involves two page requests; first, a form is
    *     built and rendered for the user to fill in. Then, the user fills the
    *     form in and submits it, triggering a second page request in which the
    *     form must be built and processed. By default, $form and $form_state are
-   *     built from scratch during each of these page requests. Often, it is
-   *     necessary or desired to persist the $form and $form_state variables
-   *     from the initial page request to the one that processes the submission.
-   *     'cache' can be set to TRUE to do this. A prominent example is an
-   *     Ajax-enabled form, in which ajax_process_form() enables form caching
-   *     for all forms that include an element with the #ajax property. (The
-   *     Ajax handler has no way to build the form itself, so must rely on the
-   *     cached version.) Note that the persistence of $form and $form_state
-   *     happens automatically for (multi-step) forms having the 'rebuild' flag
-   *     set, regardless of the value for 'cache'.
-   *   - no_cache: If set to TRUE the form will NOT be cached, even if 'cache'
-   *     is set.
+   *     built from scratch during each of these page requests. Sometimes, it is
+   *     necessary to persist $form_state from the initial page request to the
+   *     one that processes the submission. 'persist' can be set to TRUE to do
+   *     this. A prominent example is an Ajax-enabled form, in which
+   *     ajax_process_form() enables form state persisting for all forms that
+   *     include an element with the #ajax property. (The Ajax handler doesn't
+   *     have enough information from the HTTP request to rebuild the form
+   *     securely without first validating against a stored form state.) Note
+   *     that the persistence of $form_state happens automatically for
+   *     (multi-step) forms having the 'rebuild' flag set, regardless of the
+   *     value for 'persist'.
+   *   - cache_form: If set to TRUE the original, unprocessed form structure
+   *     is cached when $form_state is persisted (see 'persist' above). By
+   *     default, even when $form_state is persisted, $form gets built from
+   *     scratch during each page request. If a particular form is time
+   *     consuming to construct, 'cache_form' may be set to speed up the form
+   *     submission page request. However, it is recommended to use this
+   *     sparingly (if ever), because on a busy site, it can bloat the cache
+   *     backend for relatively little gain.
+   *   - no_persist: If set to TRUE the form state will NOT be persisted (and
+   *     therefore, the form will not be cached), regardless of the 'persist'
+   *     and 'cache_form' settings.
    *   - values: An associative array of values submitted to the form. The
    *     validation functions and submit functions use this array for nearly all
    *     their decision making. (Note that #tree determines whether the values
@@ -230,7 +240,7 @@ public function getForm($form_arg);
    *
    * @see self::redirectForm()
    */
-  public function buildForm($form_id, array &$form_state);
+  public function buildForm($form_id, array &$form_state, $process = TRUE);
 
   /**
    * Retrieves default values for the $form_state array.
@@ -280,14 +290,14 @@ public function getFormStateDefaults();
   public function rebuildForm($form_id, &$form_state, $old_form = NULL);
 
   /**
-   * Fetches a form from the cache.
+   * Loads the form state and if the form is cached, fetches it.
    */
-  public function getCache($form_build_id, &$form_state);
+  public function loadState($form_build_id, &$form_state);
 
   /**
-   * Stores a form in the cache.
+   * Saves the form state and optionally caches the form.
    */
-  public function setCache($form_build_id, $form, $form_state);
+  public function saveState($form_build_id, $form, $form_state);
 
   /**
    * Retrieves, populates, and processes a form.
diff --git a/core/modules/system/lib/Drupal/system/Controller/FormAjaxController.php b/core/modules/system/lib/Drupal/system/Controller/FormAjaxController.php
index f1645a7..655cfad 100644
--- a/core/modules/system/lib/Drupal/system/Controller/FormAjaxController.php
+++ b/core/modules/system/lib/Drupal/system/Controller/FormAjaxController.php
@@ -73,32 +73,29 @@ protected function getForm(Request $request) {
     $form_state = form_state_defaults();
     $form_build_id = $request->request->get('form_build_id');
 
-    // Get the form from the cache.
-    $form = form_get_cache($form_build_id, $form_state);
-    if (!$form) {
-      // If $form cannot be loaded from the cache, the form_build_id must be
-      // invalid, which means that someone performed a POST request onto
-      // system/ajax without actually viewing the concerned form in the browser.
-      // This is likely a hacking attempt as it never happens under normal
-      // circumstances.
+    // Load persisted $form_state, and possibly a cached $form.
+    \Drupal::formBuilder()->loadState($form_build_id, $form_state);
+
+    if (!isset($form_state['build_info']['form_id'])) {
+      // If a persisted $form_state wasn't retrieved (e.g., it expired or the
+      // form build id is invalid), then we can't proceed.
       watchdog('ajax', 'Invalid form POST data.', array(), WATCHDOG_WARNING);
       throw new BadRequestHttpException();
     }
 
+    // Build the form, but don't process it yet.
+    $form_id = $form_state['build_info']['form_id'];
+    $form = \Drupal::formBuilder()->buildForm($form_id, $form_state, FALSE);
+
     // Since some of the submit handlers are run, redirects need to be disabled.
     $form_state['no_redirect'] = TRUE;
 
     // When a form is rebuilt after Ajax processing, its #build_id and #action
     // should not change.
-    // @see drupal_rebuild_form()
+    // @see \Drupal\Core\Form\FormBuilder::rebuildForm()
     $form_state['rebuild_info']['copy']['#build_id'] = TRUE;
     $form_state['rebuild_info']['copy']['#action'] = TRUE;
 
-    // The form needs to be processed; prepare for that by setting a few internal
-    // variables.
-    $form_state['input'] = $request->request->all();
-    $form_id = $form['#form_id'];
-
     return array($form, $form_state, $form_id, $form_build_id);
   }
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php
index 0e6d629..21867ad 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php
@@ -25,7 +25,7 @@ class FormCacheTest extends DrupalUnitTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Form cache tests',
-      'description' => 'Tests form_set_cache() and form_get_cache()',
+      'description' => 'Tests FormBuilder::saveState() and FormBuilder::loadState()',
       'group' => 'Form API',
     );
   }
@@ -47,28 +47,28 @@ public function setUp() {
    */
   function testCacheToken() {
     $this->container->set('current_user', new UserSession(array('uid' => 1)));
-    form_set_cache($this->form_build_id, $this->form, $this->form_state);
+    \Drupal::formBuilder()->saveState($this->form_build_id, $this->form, $this->form_state);
 
-    $cached_form_state = form_state_defaults();
-    $cached_form = form_get_cache($this->form_build_id, $cached_form_state);
-    $this->assertEqual($this->form['#property'], $cached_form['#property']);
-    $this->assertTrue(!empty($cached_form['#cache_token']), 'Form has a cache token');
-    $this->assertEqual($this->form_state['example'], $cached_form_state['example']);
+    $form_state = form_state_defaults();
+    $form = \Drupal::formBuilder()->loadState($this->form_build_id, $form_state);
+    $this->assertEqual($this->form['#property'], $form['#property']);
+    $this->assertTrue(!empty($form_state['csrf_token']), 'Form state has a CSRF token for authenticated users');
+    $this->assertEqual($this->form_state['example'], $form_state['example']);
 
     // Test that the form cache isn't loaded when the session/token has changed.
     // Change the private key. (We cannot change the session ID because this
     // will break the parent site test runner batch.)
     \Drupal::state()->set('system.private_key', 'invalid');
-    $cached_form_state = form_state_defaults();
-    $cached_form = form_get_cache($this->form_build_id, $cached_form_state);
-    $this->assertFalse($cached_form, 'No form returned from cache');
-    $this->assertTrue(empty($cached_form_state['example']));
+    $form_state = form_state_defaults();
+    $form = \Drupal::formBuilder()->loadState($this->form_build_id, $form_state);
+    $this->assertFalse($form, 'No form returned from cache');
+    $this->assertTrue(empty($form_state['example']));
 
     // Test that loading the cache with a different form_id fails.
     $wrong_form_build_id = $this->randomName(9);
-    $cached_form_state = form_state_defaults();
-    $this->assertFalse(form_get_cache($wrong_form_build_id, $cached_form_state), 'No form returned from cache');
-    $this->assertTrue(empty($cached_form_state['example']), 'Cached form state was not loaded');
+    $form_state = form_state_defaults();
+    $this->assertFalse(\Drupal::formBuilder()->loadState($wrong_form_build_id, $form_state), 'No form returned from cache');
+    $this->assertTrue(empty($form_state['example']), 'Cached form state was not loaded');
   }
 
   /**
@@ -78,13 +78,13 @@ function testNoCacheToken() {
     $this->container->set('current_user', new UserSession(array('uid' => 0)));
 
     $this->form_state['example'] = $this->randomName();
-    form_set_cache($this->form_build_id, $this->form, $this->form_state);
+    \Drupal::formBuilder()->saveState($this->form_build_id, $this->form, $this->form_state);
 
-    $cached_form_state = form_state_defaults();
-    $cached_form = form_get_cache($this->form_build_id, $cached_form_state);
-    $this->assertEqual($this->form['#property'], $cached_form['#property']);
-    $this->assertTrue(empty($cached_form['#cache_token']), 'Form has no cache token');
-    $this->assertEqual($this->form_state['example'], $cached_form_state['example']);
+    $form_state = form_state_defaults();
+    $form = \Drupal::formBuilder()->loadState($this->form_build_id, $form_state);
+    $this->assertEqual($this->form['#property'], $form['#property']);
+    $this->assertTrue(empty($form_state['csrf_token']), 'Form state has no CSRF token for anonymous users');
+    $this->assertEqual($this->form_state['example'], $form_state['example']);
   }
 
 }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php
index a05e684..687dea7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php
@@ -27,7 +27,7 @@ class RebuildTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Form rebuilding',
-      'description' => 'Tests functionality of drupal_rebuild_form().',
+      'description' => 'Tests functionality of form FormBuilder::rebuildForm()',
       'group' => 'Form API',
     );
   }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php
index 766878e..9103447 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php
@@ -69,7 +69,7 @@ function testForm() {
   }
 
   /**
-   * Tests using the form with an activated $form_state['cache'] property.
+   * Tests using the form with an activated $form_state['cache_form'] property.
    */
   function testFormCached() {
     $this->drupalGet('form_test/form-storage', array('query' => array('cache' => 1)));
@@ -93,6 +93,37 @@ function testFormCached() {
   }
 
   /**
+   * Tests using the form with clearing the cache during the multistep sequence.
+   *
+   * $form_state storage in the keyvalue store should continue to work
+   * regardless of the $form cache.
+   */
+  function testFormCacheCleared() {
+    $this->drupalGet('form_test/form-storage', array('query' => array('cache' => 1)));
+    $this->assertText('Form constructions: 1');
+    $this->container->get('cache.form')->deleteAll();
+
+    // Use form rebuilding triggered by a submit button.
+    $edit = array('title' => 'new', 'value' => 'value_is_set');
+    $this->drupalPostForm(NULL, $edit, 'Continue submit');
+    $this->assertText('Form constructions: 2');
+    $this->assertText('Form constructions: 3');
+    $this->container->get('cache.form')->deleteAll();
+
+    // Reset the form to the values of the storage, using a form rebuild
+    // triggered by button of type button.
+    $this->drupalPostForm(NULL, array('title' => 'changed'), 'Reset');
+    $this->assertFieldByName('title', 'new', 'Values have been resetted.');
+    $this->assertText('Form constructions: 4');
+    $this->assertText('Form constructions: 5');
+    $this->container->get('cache.form')->deleteAll();
+
+    $this->drupalPostForm(NULL, $edit, 'Save');
+    $this->assertText('Form constructions: 6');
+    $this->assertText('Title: new', 'The form storage has stored the values.');
+  }
+
+  /**
    * Tests validation when form storage is used.
    */
   function testValidation() {
diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module
index 922bc78..c463f70 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -111,7 +111,8 @@ function form_test_validate_form($form, &$form_state) {
 
   // To simplify this test, enable form caching and use form storage to
   // remember our alteration.
-  $form_state['cache'] = TRUE;
+  $form_state['persist'] = TRUE;
+  $form_state['cache_form'] = TRUE;
 
   return $form;
 }
@@ -608,7 +609,8 @@ function form_test_storage_form($form, &$form_state) {
   if (\Drupal::request()->get('cache')) {
     // Manually activate caching, so we can test that the storage keeps working
     // when it's enabled.
-    $form_state['cache'] = TRUE;
+    $form_state['persist'] = TRUE;
+    $form_state['cache_form'] = TRUE;
   }
 
   return $form;
@@ -1761,7 +1763,8 @@ function form_test_form_form_test_state_persist_alter(&$form, &$form_state) {
   // Simulate a form alter implementation inserting form elements that enable
   // caching of the form, e.g. elements having #ajax.
   if (\Drupal::request()->get('cache')) {
-    $form_state['cache'] = TRUE;
+    $form_state['persist'] = TRUE;
+    $form_state['cache_form'] = TRUE;
   }
 }
 
@@ -2201,8 +2204,8 @@ function form_test_form_state_database($form, &$form_state) {
  * Form submit handler for database form_state test.
  */
 function form_test_form_state_database_submit($form, &$form_state) {
-  $form_state['cache'] = TRUE;
   $form_state['rebuild'] = TRUE;
+  $form_state['cache_form'] = TRUE;
 
   if ($form_state['storage']['database'] instanceof $form_state['storage']['database_class']) {
     $form_state['storage']['database_connection_found'] = TRUE;
diff --git a/core/modules/views/includes/ajax.inc b/core/modules/views/includes/ajax.inc
index 337524d..6b9d9ab 100644
--- a/core/modules/views/includes/ajax.inc
+++ b/core/modules/views/includes/ajax.inc
@@ -24,7 +24,7 @@ function views_ajax_form_wrapper($form_id, &$form_state) {
   $form_state += array(
     'rerender' => FALSE,
     'no_redirect' => !empty($form_state['ajax']),
-    'no_cache' => TRUE,
+    'no_persist' => TRUE,
     'build_info' => array(
       'args' => array(),
     ),
diff --git a/core/modules/views/lib/Drupal/views/Form/ViewsForm.php b/core/modules/views/lib/Drupal/views/Form/ViewsForm.php
index 3e409f7..148338c 100644
--- a/core/modules/views/lib/Drupal/views/Form/ViewsForm.php
+++ b/core/modules/views/lib/Drupal/views/Form/ViewsForm.php
@@ -121,7 +121,8 @@ public function buildForm(array $form, array &$form_state, ViewExecutable $view
     // and submission, which could lead to data being processed incorrectly,
     // because the views rows (and thus, the form elements as well) have changed
     // in the meantime.
-    $form_state['cache'] = TRUE;
+    $form_state['persist'] = TRUE;
+    $form_state['cache_form'] = TRUE;
 
     $form = array();
 
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index 05c11cc..e23b081 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -63,15 +63,15 @@ public static function create(ContainerInterface $container) {
   public function form(array $form, array &$form_state) {
     $view = $this->entity;
     $display_id = $this->displayID;
-    // Do not allow the form to be cached, because $form_state['view'] can become
-    // stale between page requests.
+    // Do not allow the form state to be persisted, because $form_state['view']
+    // can become stale between page requests.
     // See views_ui_ajax_get_form() for how this affects #ajax.
-    // @todo To remove this and allow the form to be cacheable:
+    // @todo To remove this and allow the state to be persistable:
     //   - Change $form_state['view'] to $form_state['temporary']['view'].
-    //   - Add a #process function to initialize $form_state['temporary']['view']
-    //     on cached form submissions.
+    //   - Add a #process function to initialize
+    //     $form_state['temporary']['view'] on cached form submissions.
     //   - Use form_load_include().
-    $form_state['no_cache'] = TRUE;
+    $form_state['no_persist'] = TRUE;
 
     if ($display_id) {
       if (!$view->getExecutable()->setDisplay($display_id)) {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
index 4533f76..fd5384a 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
@@ -57,7 +57,7 @@ public function form(array $form, array &$form_state) {
     $seen_ids_init = &drupal_static('drupal_html_id:init');
     $seen_ids_init = array();
 
-    $form_state['no_cache'] = TRUE;
+    $form_state['no_persist'] = TRUE;
 
     $form['controls']['#attributes'] = array('class' => array('clearfix'));
 
diff --git a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
index 0b52a75..e48e9d7 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
@@ -599,21 +599,23 @@ public function testGetCache() {
     $form_state = array();
     $form_state['build_info']['args'] = array();
     $form_state['build_info']['files'] = array(array('module' => 'node', 'type' => 'pages.inc'));
-    $form_state['cache'] = TRUE;
+    $form_state['persist'] = TRUE;
+    $form_state['cache_form'] = TRUE;
     $form = $this->formBuilder->buildForm($form_arg, $form_state);
 
     $cached_form = $form;
-    $cached_form['#cache_token'] = 'csrf_token';
-    // The form cache, form_state cache, and CSRF token validation will only be
-    // called on the cached form.
+    $stored_form_state = $form_state;
+    $stored_form_state['csrf_token'] = 'csrf_token';
+    // The form cache, form_state keyvalue, and CSRF token validation will only
+    // be called on the cached form.
     $this->formCache->expects($this->once())
-      ->method('setWithExpire');
+      ->method('set');
     $this->formCache->expects($this->once())
       ->method('get')
-      ->will($this->returnValue($cached_form));
-    $this->formStateCache->expects($this->once())
+      ->will($this->returnValue((object) array('data' => $cached_form)));
+    $this->formStateKeyValue->expects($this->once())
       ->method('get')
-      ->will($this->returnValue($form_state));
+      ->will($this->returnValue($stored_form_state));
 
     // The final form build will not trigger any actual form building, but will
     // use the form cache.
diff --git a/core/tests/Drupal/Tests/Core/Form/FormTestBase.php b/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
index 3b7a97f..cb36f2c 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
@@ -43,18 +43,18 @@
   protected $moduleHandler;
 
   /**
-   * The expirable key value store used by form cache.
+   * The cache backend for the form cache.
    *
-   * @var \PHPUnit_Framework_MockObject_MockObject|\Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface
+   * @var \PHPUnit_Framework_MockObject_MockObject|\Drupal\Core\Cache\CacheBackendInterface
    */
   protected $formCache;
 
   /**
-   * The expirable key value store used by form state cache.
+   * The expirable key value store used for persisting form state.
    *
    * @var \PHPUnit_Framework_MockObject_MockObject|\Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface
    */
-  protected $formStateCache;
+  protected $formStateKeyValue;
 
   /**
    * The current user.
@@ -104,16 +104,15 @@
   public function setUp() {
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
 
-    $this->formCache = $this->getMock('Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface');
-    $this->formStateCache = $this->getMock('Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface');
+    $this->formCache = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
+    $this->formStateKeyValue = $this->getMock('Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface');
     $this->keyValueExpirableFactory = $this->getMockBuilder('Drupal\Core\KeyValueStore\KeyValueExpirableFactory')
       ->disableOriginalConstructor()
       ->getMock();
     $this->keyValueExpirableFactory->expects($this->any())
       ->method('get')
       ->will($this->returnValueMap(array(
-        array('form', $this->formCache),
-        array('form_state', $this->formStateCache),
+        array('form_state', $this->formStateKeyValue),
       )));
 
     $this->eventDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
@@ -142,7 +141,7 @@ protected function tearDown() {
    * Sets up a new form builder object to test.
    */
   protected function setupFormBuilder() {
-    $this->formBuilder = new TestFormBuilder($this->moduleHandler, $this->keyValueExpirableFactory, $this->eventDispatcher, $this->urlGenerator, $this->translationManager, $this->csrfToken, $this->httpKernel);
+    $this->formBuilder = new TestFormBuilder($this->moduleHandler, $this->keyValueExpirableFactory, $this->formCache, $this->eventDispatcher, $this->urlGenerator, $this->translationManager, $this->csrfToken, $this->httpKernel);
     $this->formBuilder->setRequest($this->request);
     $this->formBuilder->setCurrentUser($this->account);
   }
