A few fixes for caching, large builds and default arch
Merge pull request #29 from jonludlam/master

A few fixes for caching, large builds and default arch