diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3db16f13d6..1caa607a8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,7 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co
   - Fixed Keyboard is covering web page inputs
 - Increased `tryToSetForeground` delay to fix potential crashes (@nonproto)
 - Update dependency org.conscrypt:conscrypt-android to v2.5.3
+- Port upstream's download cache system
 
 ## [1.8.5.13]
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
index 3ff36e5a1e..2be641e573 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
@@ -199,6 +199,7 @@ class DownloadCache(
                 _isInitializing.emit(true)
             }
 
+            // FIXME: Wait for SourceManager to be initialized
             val sources = getSources()
 
             val sourceMap = sources.associate { provider.getSourceDirName(it).lowercase() to it.id }