move_extension_list_reset.diff

move_extension_list_reset.diff

diff --git a/core/includes/common.inc b/core/includes/common.inc
index f640a90121..a1397dd9c3 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -553,15 +553,15 @@ function drupal_flush_all_caches($kernel = NULL) {
   // to reset the theme manager.
   \Drupal::theme()->resetActiveTheme();
 
+ // Rebuild module data that is stored in state.
+  \Drupal::service('extension.list.module')->reset();
+
   if (!$kernel instanceof DrupalKernel) {
     $kernel = \Drupal::service('kernel');
     $kernel->invalidateContainer();
     $kernel->rebuildContainer();
   }
 
-  // Rebuild module data that is stored in state.
-  \Drupal::service('extension.list.module')->reset();
-
   // Rebuild all information based on new module data.
   \Drupal::moduleHandler()->invokeAll('rebuild');