Some cache changes in build.py