diff --git a/core/lib/Drupal/Core/Cache/Context/PathParentCacheContext.php b/core/lib/Drupal/Core/Cache/Context/PathParentCacheContext.php
index 60481f9..c815077 100644
--- a/core/lib/Drupal/Core/Cache/Context/PathParentCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/PathParentCacheContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Cache\Context;
+namespace Drupal\Core\Cache\Context;
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CacheContextInterface;
@@ -9,12 +9,12 @@
 /**
  * Defines the path-based breadcrumb cache context service.
  *
- * Cache context ID: 'url.breadcrumb'.
+ * Cache context ID: 'url.path.parent'.
  *
- * This allows for caching the path-based breadcrumb efficiently by taking into
- * account 404 pages which will have similar breadcrumbs.
+ * This allows for caching based on the path, excluding everything after the
+ * last forward slash.
  */
-class PathBreadcrumbCacheContext implements CacheContextInterface {
+class PathParentCacheContext implements CacheContextInterface {
 
   /**
    * The request stack.
@@ -44,9 +44,6 @@ public static function getLabel() {
    * {@inheritdoc}
    */
   public function getContext() {
-    // The path-based breadcrumb builder does not show the title of the current
-    // page in the breadcrumb, therefore there's no need to take the last part
-    // of the path into account when caching.
     $request = $this->requestStack->getCurrentRequest();
     $path_elements = explode('/', trim($request->getPathInfo(), '/'));
     array_pop($path_elements);
@@ -57,7 +54,7 @@ public function getContext() {
    * {@inheritdoc}
    */
   public function getCacheableMetadata() {
-    return  new CacheableMetadata();
+    return new CacheableMetadata();
   }
 
 }
diff --git a/core/modules/system/src/PathBasedBreadcrumbBuilder.php b/core/modules/system/src/PathBasedBreadcrumbBuilder.php
index f148b45..704528d 100644
--- a/core/modules/system/src/PathBasedBreadcrumbBuilder.php
+++ b/core/modules/system/src/PathBasedBreadcrumbBuilder.php
@@ -137,7 +137,7 @@ public function build(RouteMatchInterface $route_match) {
     // @todo Find a better way to deal with /user.
     $exclude['/user'] = TRUE;
     // Add the url.breadcrumb cache context.
-    $breadcrumb->addCacheContexts(['url.breadcrumb']);
+    $breadcrumb->addCacheContexts(['url.path.parent']);
     while (count($path_elements) > 1) {
       array_pop($path_elements);
       // Copy the path elements for up-casting.