diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index ba7435bb..9a1e71bb 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -1141,9 +1141,6 @@ on charger
     write /proc/vendor_sched/sys_uclamp_min 0
     write /proc/vendor_sched/sys_prefer_idle 0
 
-    # Enable SICD
-    write /sys/devices/system/cpu/cpupm/cpupm/sicd 1
-
 on property:vendor.disable.bcl.control=1
     write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0
 
diff --git a/device.mk b/device.mk
index 74b1cb5b..d5b95046 100644
--- a/device.mk
+++ b/device.mk
@@ -288,6 +288,11 @@ PRODUCT_COPY_FILES += \
 
 #endif
 
+# Configure EGL blobcache
+PRODUCT_VENDOR_PROPERTIES += \
+	ro.egl.blobcache.multifile=true \
+	ro.egl.blobcache.multifile_limit=33554432 \
+
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
 	graphics.gpu.profiler.support=true \