diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
index acf91b6..aeb6e71 100644
--- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
+++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
@@ -30,8 +30,6 @@
 import com.android.wallpaper.R;
 import com.android.wallpaper.util.PreviewUtils;
 
-import com.bumptech.glide.Glide;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -99,7 +97,6 @@
                 mOptions.add(new GridOption(title, name, isSet, rows, cols,
                         mPreviewUtils.getUri(PREVIEW), previewCount, iconPath));
             }
-            Glide.get(mContext).clearDiskCache();
         } catch (Exception e) {
             mOptions = null;
         }
diff --git a/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java b/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java
index 761e2fa..0385bbb 100644
--- a/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java
+++ b/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java
@@ -44,7 +44,7 @@
     }
 
     @WorkerThread
-    protected boolean fetchThemedIconEnabled() {
+    public boolean fetchThemedIconEnabled() {
         ContentResolver contentResolver = mContext.getContentResolver();
         try (Cursor cursor = contentResolver.query(
                 mThemedIconUtils.getUriForPath(ICON_THEMED), /* projection= */