diff --git a/config/BoardConfigCM.mk b/config/BoardConfigCM.mk
index a8bf1ad..232ceb6 100644
--- a/config/BoardConfigCM.mk
+++ b/config/BoardConfigCM.mk
@@ -2,3 +2,11 @@
 ifneq ($(WITH_CM_CHARGER),false)
     BOARD_HAL_STATIC_LIBRARIES := libhealthd.cm
 endif
+
+ifeq ($(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),)
+  ADDITIONAL_DEFAULT_PROPERTIES += \
+    ro.device.cache_dir=/data/cache
+else
+  ADDITIONAL_DEFAULT_PROPERTIES += \
+    ro.device.cache_dir=/cache
+endif