Improve caching.

src/wp-includes/class-wp-theme-json-resolver.php

@@ -275,15 +275,15 @@ public static function get_user_data_from_wp_global_styles( $theme, $create_post
 
 		$cache_key = sprintf( 'wp_global_styles_%s', md5( serialize( $args ) ) );
 		$post_id   = (int) get_transient( $cache_key );
-		if ( $post_id > 0 ) {
-			return get_post( $post_id, ARRAY_A );
-		}
-
 		// Special case: '-1' is a results not found.
 		if ( -1 === $post_id && ! $create_post ) {
 			return $user_cpt;
 		}
 
+		if ( $post_id > 0 && in_array( get_post_status( $post_id ), (array) $post_status_filter, true ) ) {
+			return get_post( $post_id, ARRAY_A );
+		}
+
 		$recent_posts = new WP_Query( $args );
 		if ( is_array( $recent_posts ) && ( count( $recent_posts ) === 1 ) ) {
 			$user_cpt = $recent_posts[0];
@@ -303,8 +303,7 @@ public static function get_user_data_from_wp_global_styles( $theme, $create_post
 			);
 			$user_cpt    = get_post( $cpt_post_id, ARRAY_A );
 		}
-		$cache_expiration = $user_cpt ? DAY_IN_SECONDS : HOUR_IN_SECONDS;
-		set_transient( $cache_key, $user_cpt ? $user_cpt['ID'] : -1, $cache_expiration );
+		set_transient( $cache_key, $user_cpt ? $user_cpt['ID'] : -1 );
 
 		return $user_cpt;
 	}