diff --git a/core/common/src/main/java/dev/anilbeesetti/nextplayer/core/common/extensions/Context.kt b/core/common/src/main/java/dev/anilbeesetti/nextplayer/core/common/extensions/Context.kt
index b91e37214..73df8ae0a 100644
--- a/core/common/src/main/java/dev/anilbeesetti/nextplayer/core/common/extensions/Context.kt
+++ b/core/common/src/main/java/dev/anilbeesetti/nextplayer/core/common/extensions/Context.kt
@@ -310,16 +310,6 @@ fun Context.convertToUTF8(inputUri: Uri, inputStreamReader: InputStreamReader):
     return inputUri
 }
 
-fun Context.clearCache() {
-    try {
-        cacheDir.listFiles()?.onEach {
-            if (it.isFile) it.delete()
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-}
-
 /**
  * For this to work set android:requestLegacyExternalStorage=true in AndroidManifest.xml
  */
diff --git a/core/media/src/main/java/dev/anilbeesetti/nextplayer/core/media/sync/LocalMediaInfoSynchronizer.kt b/core/media/src/main/java/dev/anilbeesetti/nextplayer/core/media/sync/LocalMediaInfoSynchronizer.kt
index 990b4c698..f5c3095c1 100644
--- a/core/media/src/main/java/dev/anilbeesetti/nextplayer/core/media/sync/LocalMediaInfoSynchronizer.kt
+++ b/core/media/src/main/java/dev/anilbeesetti/nextplayer/core/media/sync/LocalMediaInfoSynchronizer.kt
@@ -42,6 +42,7 @@ class LocalMediaInfoSynchronizer @Inject constructor(
         media.collect { mediumUri ->
             val path = context.getPath(mediumUri) ?: return@collect
             val medium = mediumDao.getWithInfo(path) ?: return@collect
+            Log.d(TAG, "sync: $mediumUri - ${medium.mediumEntity.thumbnailPath}")
             if (medium.mediumEntity.thumbnailPath?.let { File(it) }?.exists() == true) return@collect
 
             Log.d(TAG, "sync: $mediumUri")
@@ -56,7 +57,7 @@ class LocalMediaInfoSynchronizer @Inject constructor(
             val videoStreamInfo = mediaInfo.videoStream?.toVideoStreamInfoEntity(medium.mediumEntity.path)
             val audioStreamsInfo = mediaInfo.audioStreams.map { it.toAudioStreamInfoEntity(medium.mediumEntity.path) }
             val subtitleStreamsInfo = mediaInfo.subtitleStreams.map { it.toSubtitleStreamInfoEntity(medium.mediumEntity.path) }
-            val thumbnailPath = thumbnail?.saveTo(storageDir = context.cacheDir, quality = 30)
+            val thumbnailPath = thumbnail?.saveTo(storageDir = File(context.cacheDir, "thumbnails"), quality = 30)
 
             mediumDao.upsert(medium.mediumEntity.copy(format = mediaInfo.format, thumbnailPath = thumbnailPath))
             videoStreamInfo?.let { mediumDao.upsertVideoStreamInfo(it) }
@@ -111,6 +112,7 @@ fun SubtitleStream.toSubtitleStreamInfoEntity(mediumPath: String) = SubtitleStre
 )
 
 suspend fun Bitmap.saveTo(storageDir: File, quality: Int = 100): String? = withContext(Dispatchers.IO) {
+    if (!storageDir.exists()) storageDir.mkdir()
     val thumbnailFileName = "thumbnail-${System.currentTimeMillis()}"
     val thumbFile = File(storageDir, thumbnailFileName)
     try {
diff --git a/feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/PlayerActivity.kt b/feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/PlayerActivity.kt
index 161df2c47..4d36ca79d 100644
--- a/feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/PlayerActivity.kt
+++ b/feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/PlayerActivity.kt
@@ -50,7 +50,6 @@ import com.google.android.material.color.DynamicColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import dev.anilbeesetti.nextplayer.core.common.Utils
-import dev.anilbeesetti.nextplayer.core.common.extensions.clearCache
 import dev.anilbeesetti.nextplayer.core.common.extensions.convertToUTF8
 import dev.anilbeesetti.nextplayer.core.common.extensions.getFilenameFromUri
 import dev.anilbeesetti.nextplayer.core.common.extensions.getMediaContentUri
@@ -632,7 +631,6 @@ class PlayerActivity : AppCompatActivity() {
     }
 
     override fun finish() {
-        clearCache()
         if (playerApi.shouldReturnResult) {
             val result = playerApi.getResult(
                 isPlaybackFinished = isPlaybackFinished,
diff --git a/feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/extensions/ScreenOrientation.kt b/feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/extensions/ScreenOrientation.kt
index 2e831c1ab..939a5d73a 100644
--- a/feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/extensions/ScreenOrientation.kt
+++ b/feature/player/src/main/java/dev/anilbeesetti/nextplayer/feature/player/extensions/ScreenOrientation.kt
@@ -10,7 +10,6 @@ fun ScreenOrientation.toActivityOrientation(videoOrientation: Int? = null): Int
         ScreenOrientation.LANDSCAPE_REVERSE -> ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
         ScreenOrientation.LANDSCAPE_AUTO -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
         ScreenOrientation.PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-        ScreenOrientation.VIDEO_ORIENTATION ->
-            videoOrientation ?: ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+        ScreenOrientation.VIDEO_ORIENTATION -> videoOrientation ?: ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
     }
 }