diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 8032123d18..f8323dd3b7 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -614,10 +614,28 @@ function wp_cache_switch_to_blog_fallback() {
 	$global_groups         = false;
 	$non_persistent_groups = false;
 
-	if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
-		$global_groups         = array_keys( $wp_object_cache->global_groups );
-		$all_groups            = array_fill_keys( array_keys( $wp_object_cache->cache ), true );
-		$non_persistent_groups = array_keys( array_diff_key( $all_groups, $wp_object_cache->global_groups ) );
+	if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) && is_array( $wp_object_cache->global_groups ) ) {
+
+		// Get the global groups as they are.
+		$group_names = $wp_object_cache->global_groups;
+
+		// Get global group keys if non-numeric array.
+		if ( ! wp_is_numeric_array( $group_names ) ) {
+			$group_names = array_keys( $group_names );
+		}
+
+		$global_groups = $group_names;
+
+		/*
+		 * Non-persistent groups: Check for no_mc_groups first (memcached drop-in).
+		 * Fall back to cache structure (default cache).
+		 */
+		if ( isset( $wp_object_cache->no_mc_groups ) && is_array( $wp_object_cache->no_mc_groups ) && ! empty( $wp_object_cache->no_mc_groups ) ) {
+			$non_persistent_groups = $wp_object_cache->no_mc_groups;
+		} elseif ( isset( $wp_object_cache->cache ) && is_array( $wp_object_cache->cache ) ) {
+			$all_groups            = array_keys( $wp_object_cache->cache );
+			$non_persistent_groups = array_values( array_diff( $all_groups, $global_groups ) );
+		}
 	}
 
 	wp_cache_init();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bcc0308346..aad719a746 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-beta2-61771';
+$wp_version = '7.0-beta2-61772';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.