Merge "Enable /cache mount point"