diff --git a/core/lib/Drupal/Core/Utility/ModuleInfo.php b/core/lib/Drupal/Core/Utility/ModuleInfo.php
new file mode 100644
index 0000000..e5391f2
--- /dev/null
+++ b/core/lib/Drupal/Core/Utility/ModuleInfo.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\Core\Utility\ModuleInfo.
+ */
+
+namespace Drupal\Core\Utility;
+
+use Drupal\Core\Utility\CacheArray;
+
+/**
+ * Extends CacheArray to lazy load .info properties for modules.
+ *
+ * Use system_get_module_info() rather than instantiating this class directly.
+ */
+class ModuleInfo extends CacheArray {
+
+  /**
+   * The full module info array as returned by system_get_info().
+   */
+  protected $info;
+
+  /**
+   * Overrides DrupalCacheArray::resolveCacheMiss().
+   */
+  function resolveCacheMiss($offset) {
+    $data = array();
+    if (!isset($this->info)) {
+      $this->info = system_get_info('module');
+    }
+    foreach ($this->info as $module => $info) {
+      if (isset($info[$offset])) {
+        $data[$module] = $info[$offset];
+      }
+    }
+    $this->storage[$offset] = $data;
+    $this->persist($offset);
+    return $data;
+  }
+}
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index e171b8f..03adb29 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1,6 +1,7 @@
 <?php
 
 use Drupal\Core\Utility\CacheArray;
+use Drupal\Core\Utility\ModuleInfo;
 
 /**
  * @file
@@ -2453,47 +2454,18 @@ function system_get_info($type, $name = NULL) {
  *   Only modules with the property specified in their .info file will be
  *   returned.
  *
- * @see SystemModuleInfo()
+ * @see Drupal\Core\Utility\ModuleInfo
  */
 function system_get_module_info($property) {
   static $info;
   if (!isset($info)) {
-    $info = new SystemModuleInfo('system_info', 'cache');
+    $info = new ModuleInfo('system_info', 'cache');
   }
 
   return $info[$property];
 }
 
 /**
- * Extends DrupalCacheArray to lazy load .info properties for modules.
- *
- * Use system_get_module_info() rather than instantiating this class directly.
- * @see system_get_module_info()
- */
-class SystemModuleInfo extends CacheArray {
-
-  /**
-   * The full module info array as returned by system_get_info().
-   */
-  protected $info;
-
-  function resolveCacheMiss($offset) {
-    $data = array();
-    if (!isset($this->info)) {
-      $this->info = system_get_info('module');
-    }
-    foreach ($this->info as $module => $info) {
-      if (isset($info[$offset])) {
-        $data[$module] = $info[$offset];
-      }
-    }
-    $this->storage[$offset] = $data;
-    $this->persist($offset);
-    return $data;
-  }
-}
-
-/**
  * Helper function to scan and collect module .info data.
  *
  * @return