diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 63c331ac3fa966b4dc3d74bdbf0a3f2e779c66a6..014fc27f1ae02ca8eb99d2eb50de78fbdbe79192 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -230,11 +230,10 @@ function drupal_page_header() {
   if (variable_get('dev_timer', 0)) {
     timer_start();
   }
-  bootstrap_invoke_all('init');
 
   if (variable_get('cache', 0)) {
     if ($cache = page_get_cache()) {
-
+      bootstrap_invoke_all('init');
       // Set default values:
       $date = gmdate('D, d M Y H:i:s', $cache->created) .' GMT';
       $etag = '"'. md5($date) .'"';
diff --git a/includes/module.inc b/includes/module.inc
index 95e3b875e340d58b4c82a8b63937ae6de20a1295..928bed978fe6658260084b1e122673c054d0b775 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -9,11 +9,10 @@
 /**
  * Initialize all modules.
  *
- * To change the required set of modules, change this function as well as
- * system_listing() and module_list().
  */
 function module_init() {
   module_load_all();
+  module_invoke_all('init');
 }
 
 /**