Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php	(revision 13114)
+++ wp-includes/ms-functions.php	(working copy)
@@ -249,7 +249,14 @@
 
 	$key = $blog_id."-".$setting."-blog_option";
 	$value = wp_cache_get( $key, "site-options" );
-	if ( $value == null ) {
+
+	if ( $value == null && $blog_id == $wpdb->blogid ) {
+		$value = get_option( $setting, 'noop' );
+		if ( $value == false )
+			wp_cache_set( $key, 'falsevalue', 'site-options' );
+		else
+			wp_cache_set( $key, $value, 'site-options' );
+	} elseif ( $value == null && $blog_id != $wpdb->blogid ) {
 		$blog_prefix = $wpdb->get_blog_prefix( $blog_id );
 		$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$blog_prefix}options WHERE option_name = %s", $setting ) );
 		if ( is_object( $row ) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values