diff --git a/includes/common.inc b/includes/common.inc
index e3c1cd2..70c597b 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -7155,11 +7155,6 @@ function drupal_flush_all_caches() {
   system_rebuild_theme_data();
   drupal_theme_rebuild();
 
-  node_types_rebuild();
-  // node_menu() defines menu items based on node types so it needs to come
-  // after node types are rebuilt.
-  menu_rebuild();
-
   // Synchronize to catch any actions that were added or removed.
   actions_synchronize();
 
@@ -7171,6 +7166,12 @@ function drupal_flush_all_caches() {
     cache_clear_all('*', $table, TRUE);
   }
 
+  entity_info_cache_clear();
+  node_types_rebuild();
+  // node_menu() defines menu items based on node types so it needs to come
+  // after node types are rebuilt.
+  menu_rebuild();
+
   // Rebuild the bootstrap module list. We do this here so that developers
   // can get new hook_boot() implementations registered without having to
   // write a hook_update_N() function.