Index: includes/bootstrap.inc
===================================================================
--- includes/bootstrap.inc	(revision 7919)
+++ includes/bootstrap.inc	(working copy)
@@ -900,12 +900,14 @@
     }
   }
   elseif ($phase == DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE) {
-    if ($cache = page_get_cache()) {
-      if (variable_get('cache', CACHE_DISABLED) == CACHE_AGGRESSIVE) {
+    if (variable_get('cache', CACHE_DISABLED) == CACHE_AGGRESSIVE) {
+      if ($cache = page_get_cache()) {
         drupal_page_cache_header($cache);
         exit();
       }
-      elseif (variable_get('cache', CACHE_DISABLED) == CACHE_NORMAL) {
+    }
+    elseif (variable_get('cache', CACHE_DISABLED) == CACHE_NORMAL) {
+      if ($cache = page_get_cache()) {
         require_once './includes/module.inc';
         bootstrap_invoke_all('init');
         drupal_page_cache_header($cache);
@@ -913,6 +915,10 @@
         exit();
       }
     }
+    else {
+      ob_start();
+    }
+
     require_once './includes/module.inc';
   }
 }
