diff --git a/core/modules/toolbar/lib/Drupal/toolbar/PageCache/IsToolbarPath.php b/core/modules/toolbar/lib/Drupal/toolbar/PageCache/IsToolbarPath.php
deleted file mode 100644
index ae4e408..0000000
--- a/core/modules/toolbar/lib/Drupal/toolbar/PageCache/IsToolbarPath.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\toolbar\PageCache\IsToolbarPath.
- */
-
-namespace Drupal\toolbar\PageCache;
-
-use Drupal\Core\PageCache\RequestPolicyRuleInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Cache policy for the toolbar page cache service.
- *
- * This policy allows caching of requests directed to /toolbar/subtrees/{hash}
- * even for authenticated users.
- */
-class IsToolbarPath implements RequestPolicyRuleInterface {
-
-  /**
-   * Test whether this request goes to /toolbar/subtrees.
-   */
-  public function apply(Request $request) {
-    return strpos($request->getPathInfo(), '/toolbar/subtrees/') === 0;
-  }
-
-}
diff --git a/core/modules/toolbar/src/PageCache/IsToolbarPath.php b/core/modules/toolbar/src/PageCache/IsToolbarPath.php
new file mode 100644
index 0000000..ae4e408
--- /dev/null
+++ b/core/modules/toolbar/src/PageCache/IsToolbarPath.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\toolbar\PageCache\IsToolbarPath.
+ */
+
+namespace Drupal\toolbar\PageCache;
+
+use Drupal\Core\PageCache\RequestPolicyRuleInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Cache policy for the toolbar page cache service.
+ *
+ * This policy allows caching of requests directed to /toolbar/subtrees/{hash}
+ * even for authenticated users.
+ */
+class IsToolbarPath implements RequestPolicyRuleInterface {
+
+  /**
+   * Test whether this request goes to /toolbar/subtrees.
+   */
+  public function apply(Request $request) {
+    return strpos($request->getPathInfo(), '/toolbar/subtrees/') === 0;
+  }
+
+}