update build with caching fixes
Merge branch 'master' into bluebox-production-com