diff --git a/wp-includes/class-wp-feed-cache.php b/wp-includes/class-wp-feed-cache.php
index 2564dffb80..aad0143fb1 100644
--- a/wp-includes/class-wp-feed-cache.php
+++ b/wp-includes/class-wp-feed-cache.php
@@ -14,7 +14,7 @@
  *
  * @see SimplePie_Cache
  */
-class WP_Feed_Cache extends SimplePie_Cache {
+class WP_Feed_Cache {
 
 	/**
 	 * Creates a new SimplePie_Cache object.
@@ -26,7 +26,7 @@ class WP_Feed_Cache extends SimplePie_Cache {
 	 * @param string $extension 'spi' or 'spc'.
 	 * @return WP_Feed_Cache_Transient Feed cache handler object that uses transients.
 	 */
-	public function create( $location, $filename, $extension ) {
+	public static function create( $location, $filename, $extension ) {
 		return new WP_Feed_Cache_Transient( $location, $filename, $extension );
 	}
 }
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 0b84cc10a5..555442e08c 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -801,6 +801,8 @@ function fetch_feed( $url ) {
 	// constructor sets it before we have a chance to set the sanitization class.
 	$feed->sanitize = new WP_SimplePie_Sanitize_KSES();
 
+	SimplePie_Cache::register( 'wp_transient', 'WP_Feed_Cache_Transient' );
+	$feed->set_cache_location( 'wp_transient://' . $url );
 	$feed->set_cache_class( 'WP_Feed_Cache' );
 	$feed->set_file_class( 'WP_SimplePie_File' );