Index: src/wp-includes/media.php
===================================================================
--- src/wp-includes/media.php	(revision 40479)
+++ src/wp-includes/media.php	(working copy)
@@ -1335,12 +1335,10 @@

 	if ( count( $attachment_ids ) > 1 ) {
 		/*
-		 * Warm object cache for use with 'get_post_meta()'.
-		 *
-		 * To avoid making a database call for each image, a single query
-		 * warms the object cache with the meta information for all images.
-		 */
-		update_meta_cache( 'post', array_keys( $attachment_ids ) );
+		 * Warm the object cache with post and meta information for all
+		 * attachments to avoid making a database call for each image.
+ 		 */
+		_prime_post_caches( array_keys( $attachment_ids ), false, true );
 	}

 	foreach ( $selected_images as $image => $attachment_id ) {