diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index b4551a3..053f2e6 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -1,6 +1,7 @@
 <?php
 
 use Drupal\Core\Database\Database;
+use Drupal\Core\KeyValueStore\DatabaseStorage;
 use Drupal\Core\KeyValueStore\DatabaseStorageExpirable;
 
 /**
@@ -710,7 +711,14 @@ function update_verify_update_archive($project, $archive_file, $directory) {
 function update_storage($collection = 'update') {
   $storage = &drupal_static(__FUNCTION__);
   if (!isset($storage[$collection])) {
-    $storage[$collection] = new DatabaseStorageExpirable($collection, array('connection' => Database::getConnection()));
+    // @todo Set without expiration currently does not work on
+    //   DatabaseStorageExpirable.
+    if ($collection == 'update_fetch_task') {
+      $storage[$collection] = new DatabaseStorage($collection, array('connection' => Database::getConnection()));
+    }
+    else {
+      $storage[$collection] = new DatabaseStorageExpirable($collection, array('connection' => Database::getConnection()));
+    }
   }
   return $storage[$collection];
 }