Improve the caching of the build