diff --git a/core/lib/Drupal/Core/Form/FormCache.php b/core/lib/Drupal/Core/Form/FormCache.php
index ea38fd2..00449b4 100644
--- a/core/lib/Drupal/Core/Form/FormCache.php
+++ b/core/lib/Drupal/Core/Form/FormCache.php
@@ -188,8 +188,7 @@ protected function loadCachedFormState($form_build_id, FormStateInterface $form_
    * {@inheritdoc}
    */
   public function setCache($form_build_id, $form, FormStateInterface $form_state) {
-    // 6 hours cache life time for forms should be plenty.
-    $expire = 21600;
+    $expire = $this->configFactory->get("system.form")->get("cache_lifetime");
 
     // Ensure that the form build_id embedded in the form structure is the same
     // as the one passed in as a parameter. This is an additional safety measure
diff --git a/core/modules/system/config/install/system.form.yml b/core/modules/system/config/install/system.form.yml
new file mode 100644
index 0000000..9e2e584
--- /dev/null
+++ b/core/modules/system/config/install/system.form.yml
@@ -0,0 +1 @@
+cache_lifetime: 21600