A few fixes for caching, large builds and default arch