diff --git a/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php b/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
index e892212..7c82963 100644
--- a/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
+++ b/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\node\Cache;
 
-use Drupal\Core\Cache\CalculatedCacheContextInterface;
-use Drupal\Core\Cache\UserCacheContext;
+use Drupal\Core\Cache\Contexts\CalculatedCacheContextInterface;
+use Drupal\Core\Cache\Contexts\UserCacheContext;
 
 /**
  * Defines the node access view cache context service.
diff --git a/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php b/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php
index ede6410..eee4dd3 100644
--- a/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php
+++ b/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\entity_test\Cache;
 
-use Drupal\Core\Cache\CacheContextInterface;
+use Drupal\Core\Cache\Contexts\CacheContextInterface;
 
 /**
  * Defines the entity_test view grants cache context service.
diff --git a/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php b/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php
index abc456b..94db225 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views_test_data\Cache;
 
-use Drupal\Core\Cache\CacheContextInterface;
+use Drupal\Core\Cache\Contexts\CacheContextInterface;
 
 /**
  * Test cache context which uses a dynamic context coming from state.
diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheContextsManagerTest.php
index 416bd0e..0071870 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheContextsManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheContextsManagerTest.php
@@ -7,9 +7,9 @@
 
 namespace Drupal\Tests\Core\Cache;
 
-use Drupal\Core\Cache\CacheContextsManager;
-use Drupal\Core\Cache\CacheContextInterface;
-use Drupal\Core\Cache\CalculatedCacheContextInterface;
+use Drupal\Core\Cache\Contexts\CacheContextsManager;
+use Drupal\Core\Cache\Contexts\CacheContextInterface;
+use Drupal\Core\Cache\Contexts\CalculatedCacheContextInterface;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\Container;