diff --git a/app/src/main/java/org/oxycblt/auxio/image/extractor/DHash.kt b/app/src/main/java/org/oxycblt/auxio/image/extractor/DHash.kt
index 0b0949efd..1e7809606 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/extractor/DHash.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/extractor/DHash.kt
@@ -26,6 +26,7 @@ import android.graphics.ColorMatrixColorFilter
 import android.graphics.Paint
 import java.math.BigInteger
 
+@Suppress("UNUSED")
 fun Bitmap.dHash(hashSize: Int = 16): String {
     // Step 1: Resize the bitmap to a fixed size
     val resizedBitmap = Bitmap.createScaledBitmap(this, hashSize + 1, hashSize, true)
diff --git a/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt b/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt
index 00f8eb43b..2a7113066 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt
@@ -32,7 +32,7 @@ import org.oxycblt.auxio.music.info.Date
 import org.oxycblt.auxio.music.metadata.correctWhitespace
 import org.oxycblt.auxio.music.metadata.splitEscaped
 
-@Database(entities = [CachedSong::class], version = 45, exportSchema = false)
+@Database(entities = [CachedSong::class], version = 46, exportSchema = false)
 abstract class CacheDatabase : RoomDatabase() {
     abstract fun cachedSongsDao(): CachedSongsDao
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt
index fe8ca0c46..d30e5324e 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt
@@ -18,7 +18,6 @@
  
 package org.oxycblt.auxio.music.metadata
 
-import android.graphics.BitmapFactory
 import androidx.core.text.isDigitsOnly
 import androidx.media3.common.MediaItem
 import androidx.media3.exoplayer.MetadataRetriever
@@ -26,8 +25,8 @@ import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.TrackGroupArray
 import java.util.concurrent.Future
 import javax.inject.Inject
+import kotlin.math.min
 import org.oxycblt.auxio.image.extractor.CoverExtractor
-import org.oxycblt.auxio.image.extractor.dHash
 import org.oxycblt.auxio.music.device.RawSong
 import org.oxycblt.auxio.music.fs.toAudioUri
 import org.oxycblt.auxio.music.info.Date
@@ -106,10 +105,24 @@ private class TagWorkerImpl(
             populateWithId3v2(textTags.id3v2)
             populateWithVorbis(textTags.vorbis)
 
-            val coverInputStream = coverExtractor.findCoverDataInMetadata(metadata)
-            val bitmap = coverInputStream?.use { BitmapFactory.decodeStream(it) }
-            rawSong.coverPerceptualHash = bitmap?.dHash()
-            bitmap?.recycle()
+            coverExtractor.findCoverDataInMetadata(metadata)?.use {
+                val available = it.available()
+                val skip = min(available / 2L, available - COVER_KEY_SAMPLE.toLong())
+                it.skip(skip)
+                val bytes = ByteArray(COVER_KEY_SAMPLE)
+                it.read(bytes)
+
+                @OptIn(ExperimentalStdlibApi::class) val byteString = bytes.toHexString()
+
+                rawSong.coverPerceptualHash = byteString
+            }
+
+            // OPTIONAL: Nicer cover art keying using an actual perceptual hash
+            // Really bad idea if you have big cover arts. Okay idea if you have different
+            // formats for the same cover art.
+            //  val bitmap = coverInputStream?.use { BitmapFactory.decodeStream(it) }
+            //  rawSong.coverPerceptualHash = bitmap?.dHash()
+            //  bitmap?.recycle()
 
             // OPUS base gain interpretation code: This is likely not needed, as the media player
             // should be using the base gain already. Uncomment if that's not the case.
@@ -376,6 +389,8 @@ private class TagWorkerImpl(
         first().replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "").toFloatOrNull()?.nonZeroOrNull()
 
     private companion object {
+        val COVER_KEY_SAMPLE = 32
+
         val COMPILATION_ALBUM_ARTISTS = listOf("Various Artists")
         val COMPILATION_RELEASE_TYPES = listOf("compilation")
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemBrowser.kt b/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemBrowser.kt
index 0ca607167..93841a63f 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemBrowser.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemBrowser.kt
@@ -61,8 +61,6 @@ constructor(
     private var invalidator: Invalidator? = null
 
     interface Invalidator {
-        data class ParentId(val id: String, val itemCount: Int)
-
         fun invalidate(ids: Map<String, Int>)
 
         fun invalidate(controller: ControllerInfo, query: String, itemCount: Int)