Add build-tools and extras to cache