Improve speedup to build  cache