Fix issue with cache clobbering on build-all