diff --git a/core/includes/common.inc b/core/includes/common.inc
index 4287dcd..66329f4 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -2757,7 +2757,7 @@ function drupal_add_library($module, $name, $every_page = NULL) {
 function drupal_get_library($extension, $name = NULL) {
   $libraries = &drupal_static(__FUNCTION__, array());
 
-  if (!isset($libraries[$extension]) && ($cache = cache()->get('library_info:' . $extension))) {
+  if (!isset($libraries[$extension]) && ($cache = cache()->get('library:info:' . $extension))) {
     $libraries[$extension] = $cache->data;
   }
 
@@ -2856,7 +2856,7 @@ function drupal_get_library($extension, $name = NULL) {
         }
       }
     }
-    cache()->set('library_info:' . $extension, $libraries[$extension], CacheBackendInterface::CACHE_PERMANENT, array('library_info'));
+    cache()->set('library:info:' . $extension, $libraries[$extension], CacheBackendInterface::CACHE_PERMANENT, array('extension' => array(TRUE, $extension)));
   }
 
   if (isset($name)) {
diff --git a/core/includes/module.inc b/core/includes/module.inc
index 3062202..3d03b8e 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -5,6 +5,7 @@
  * API for loading and interacting with Drupal modules.
  */
 
+use Drupal\Core\Cache\Cache;
 
 /**
  * Builds a list of bootstrap modules and enabled modules and themes.
@@ -117,7 +118,7 @@ function system_list_reset() {
   // Libraries may be provided by all extension types, and may be altered by any
   // other extensions (types) due to the nature of drupal_alter() and the fact
   // that profiles are recorded and handled as modules.
-  cache()->invalidateTags(array('library_info'));
+  Cache::invalidateTags(array('extension' => TRUE));
 
   // Remove last known theme data state.
   // This causes system_list() to call system_rebuild_theme_data() on its next
diff --git a/core/modules/contextual/contextual.library.yml b/core/modules/contextual/contextual.library.yml
index 2f340b4..f098617 100644
--- a/core/modules/contextual/contextual.library.yml
+++ b/core/modules/contextual/contextual.library.yml
@@ -2,7 +2,15 @@ drupal.contextual-links:
   version: VERSION
   js:
     # Ensure to run before contextual/drupal.context-toolbar.
+    # Core.
     js/contextual.js: { weight: -2 }
+    # Models.
+    js/models/StateModel.js: { weight: -2 }
+    # Views.
+    js/views/AuralView.js: { weight: -2 }
+    js/views/KeyboardView.js: { weight: -2 }
+    js/views/RegionView.js: { weight: -2 }
+    js/views/VisualView.js: { weight: -2 }
   css:
     css/contextual.module.css: {}
     css/contextual.theme.css: {}