diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index dfe73f7298..7c623d1e96 100644
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -333,6 +333,8 @@ class WP_Object_Cache {
 			}
 		}
 
+		$this->dirty_objects = array();
+
 		// Release write lock.
 		flock($mutex, LOCK_UN);
 		fclose($mutex);
diff --git a/wp-settings.php b/wp-settings.php
index de8d065f4a..2797ba7f3a 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -222,8 +222,8 @@ if ( file_exists(TEMPLATEPATH . "/functions.php") )
 	include(TEMPLATEPATH . "/functions.php");
 
 function shutdown_action_hook() {
-	wp_cache_close();
 	do_action('shutdown');
+	wp_cache_close();
 }
 register_shutdown_function('shutdown_action_hook');