Changes to install caches and optimize them