Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 19641)
+++ wp-includes/post.php	(working copy)
@@ -1508,9 +1508,9 @@
 /**
  * Retrieve post meta fields, based on post ID.
  *
- * The post meta fields are retrieved from the cache, so the function is
- * optimized to be called more than once. It also applies to the functions, that
- * use this function.
+ * The post meta fields are retrieved from the cache where possible, so the
+ * function is optimized to be called more than once. It also applies to the
+ * functions, that use this function.
  *
  * @since 1.2.0
  * @link http://codex.wordpress.org/Function_Reference/get_post_custom
@@ -1526,10 +1526,18 @@
 	if ( ! $post_id )
 		$post_id = get_the_ID();
 
-	if ( ! wp_cache_get( $post_id, 'post_meta' ) )
-		update_postmeta_cache( $post_id );
+	if ( ! wp_cache_get( $post_id, 'post_meta' ) ) {
 
-	return wp_cache_get( $post_id, 'post_meta' );
+        $post_meta = update_postmeta_cache( $post_id );
+        $post_meta = $post_meta [ $post_id ];
+        return $post_meta;
+
+    } else {
+
+        return wp_cache_get( $post_id, 'post_meta' );
+
+    }
+
 }
 
 /**