diff --git a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
index 3cfda5f..67809f7 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
@@ -169,17 +169,10 @@ public function containerBuild(ContainerBuilder $container) {
         ->register('keyvalue', 'Drupal\Core\KeyValueStore\KeyValueFactory')
         ->addArgument(new Reference('service_container'));
 
-      $container
-        ->register('cache.cache', 'Drupal\Core\Cache\CacheBackendInterface')
-        ->setFactoryClass('Drupal\Core\Cache\CacheFactory')
+      $container->register('state', 'Drupal\Core\KeyValueStore\KeyValueStoreInterface')
+        ->setFactoryService(new Reference('keyvalue'))
         ->setFactoryMethod('get')
-        ->addArgument('cache');
-
-      $container->register('state', 'Drupal\Core\KeyValueStore\KeyValueCacheDecorator')
-        ->addArgument(new Reference('cache.cache'))
-        ->addArgument(new Reference('lock'))
-        ->addArgument(new Reference('keyvalue'))
-        ->addArgument('state');
+       ->addArgument('state');
     }
   }