diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetchers.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt
similarity index 100%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetchers.kt
rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt
index 096cc7679e..f390b352dc 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt
@@ -23,12 +23,14 @@ import io.element.android.libraries.matrix.media.MediaResolver
 
 internal class AvatarKeyer : Keyer<AvatarData> {
     override fun key(data: AvatarData, options: Options): String? {
-        return MediaKeyer().key(data.toMetadata(), options)
+        return data.toMetadata().toKey()
     }
 }
 
 internal class MediaKeyer : Keyer<MediaResolver.Meta> {
     override fun key(data: MediaResolver.Meta, options: Options): String? {
-        return "${data.source?.url()}_${data.kind}"
+        return data.toKey()
     }
 }
+
+private fun MediaResolver.Meta.toKey() = "${source?.url()}_${kind}"