@@ -37,17 +37,19 @@ trait ModularModuleTrait
      */
     protected function _setup()
     {
-        // Cache modules, in case the `_getModules()` call is expensive
-        $this->modules = $this->_getModules();
+        $modules = $this->_getModules();
 
         // Setup all modules and collect their containers
+        $this->modules = [];
         $containers = [];
-        foreach ($this->modules as $_module) {
+        foreach ($modules as $_module) {
             $_container = $_module->setup();
 
             if ($_container !== null) {
                 $containers[] = $_container;
             }
+
+            $this->modules[$_module->getKey()] = $_module;
         }
 
         // Prepend a container with all module instances
@@ -77,7 +79,7 @@ protected function _run(ContainerInterface $c = null)
      *
      * @since [*next-version*]
      *
-     * @return ModuleInterface[]|Traversable A list of module instances, mapped by their key.
+     * @return ModuleInterface[]|Traversable A list of module instances.
      */
     abstract protected function _getModules();
Original file line number	Diff line number	Diff line change
`@@ -37,17 +37,19 @@ trait ModularModuleTrait`
`37`	`37`	`*/`
`38`	`38`	`protected function _setup()`
`39`	`39`	`{`
`40`		- // Cache modules, in case the `_getModules()` call is expensive
`41`		`- $this->modules = $this->_getModules();`
	`40`	`+ $modules = $this->_getModules();`
`42`	`41`
`43`	`42`	`// Setup all modules and collect their containers`
	`43`	`+ $this->modules = [];`
`44`	`44`	`$containers = [];`
`45`		`- foreach ($this->modules as $_module) {`
	`45`	`+ foreach ($modules as $_module) {`
`46`	`46`	`$_container = $_module->setup();`
`47`	`47`
`48`	`48`	`if ($_container !== null) {`
`49`	`49`	`$containers[] = $_container;`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ $this->modules[$_module->getKey()] = $_module;`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`// Prepend a container with all module instances`
`@@ -77,7 +79,7 @@ protected function _run(ContainerInterface $c = null)`
`77`	`79`	`*`
`78`	`80`	`* @since [next-version]`
`79`	`81`	`*`
`80`		`- * @return ModuleInterface[]\|Traversable A list of module instances, mapped by their key.`
	`82`	`+ * @return ModuleInterface[]\|Traversable A list of module instances.`
`81`	`83`	`*/`
`82`	`84`	`abstract protected function _getModules();`
`83`	`85`