diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
index 6dedc5774..10e720f08 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
@@ -44,7 +44,6 @@ import com.hippo.yorozuya.sparse.SparseJBArray;
 import com.hippo.yorozuya.sparse.SparseJLArray;
 
 import java.io.File;
-import java.util.Comparator;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -214,12 +213,7 @@ public class EhApplication extends SceneApplication {
         EhApplication application = ((EhApplication) context.getApplicationContext());
         if (application.mGalleryDetailCache == null) {
             // Max size 25, 3 min timeout
-            application.mGalleryDetailCache = new LruCacheEx<>(25,  3 * 60 * 1000, new Comparator<Long>() {
-                @Override
-                public int compare(Long lhs, Long rhs) {
-                    return lhs > rhs ? 1 : lhs > rhs ? -1 : 0;
-                }
-            });
+            application.mGalleryDetailCache = new LruCacheEx<>(25,  3 * 60 * 1000);
         }
         return application.mGalleryDetailCache;
     }
@@ -229,12 +223,7 @@ public class EhApplication extends SceneApplication {
         EhApplication application = ((EhApplication) context.getApplicationContext());
         if (application.mLargePreviewSetCache == null) {
             // Max size 50, 3 min timeout
-            application.mLargePreviewSetCache = new LruCacheEx<>(50,  3 * 60 * 1000, new Comparator<String>() {
-                @Override
-                public int compare(String lhs, String rhs) {
-                    return lhs.compareTo(rhs);
-                }
-            });
+            application.mLargePreviewSetCache = new LruCacheEx<>(50,  3 * 60 * 1000);
         }
         return application.mLargePreviewSetCache;
     }
@@ -244,12 +233,7 @@ public class EhApplication extends SceneApplication {
         EhApplication application = ((EhApplication) context.getApplicationContext());
         if (application.mPreviewPagesCache == null) {
             // Max size 50, 3 min timeout
-            application.mPreviewPagesCache = new LruCacheEx<>(50,  3 * 60 * 1000, new Comparator<Long>() {
-                @Override
-                public int compare(Long lhs, Long rhs) {
-                    return lhs > rhs ? 1 : lhs > rhs ? -1 : 0;
-                }
-            });
+            application.mPreviewPagesCache = new LruCacheEx<>(50,  3 * 60 * 1000);
         }
         return application.mPreviewPagesCache;
     }
diff --git a/beerbelly b/beerbelly
index 665d6b073..92c9080bf 160000
--- a/beerbelly
+++ b/beerbelly
@@ -1 +1 @@
-Subproject commit 665d6b0738ffcf3dd06a244e232db32444588b44
+Subproject commit 92c9080bfa12832a6a1bafd811580d73cd17cf5a
diff --git a/yorozuya b/yorozuya
index 2845c6e8d..5d3219c85 160000
--- a/yorozuya
+++ b/yorozuya
@@ -1 +1 @@
-Subproject commit 2845c6e8de5337ef72beaa748c01bae25f73243f
+Subproject commit 5d3219c85fca374df728002f578ea34fdd4ccc5a