diff --git a/system/src/Grav/Common/Media/Traits/MediaTrait.php b/system/src/Grav/Common/Media/Traits/MediaTrait.php
index 1df0ec7db..75bb356ee 100644
--- a/system/src/Grav/Common/Media/Traits/MediaTrait.php
+++ b/system/src/Grav/Common/Media/Traits/MediaTrait.php
@@ -88,7 +88,8 @@ trait MediaTrait
 
             try {
                 // Use cached media if possible.
-                $media = $cache->get($cacheKey);
+                // TODO: Do we still want to cache media?
+                $media = null; // $cache->get($cacheKey);
             } catch (Throwable $e) {
             }
 
@@ -102,7 +103,7 @@ trait MediaTrait
                     $media = new Media('', []);
                 }
 
-                $cache->set($cacheKey, $media);
+                // $cache->set($cacheKey, $media);
             }
 
             $this->media = $media;