Fix Git caching

Mostly work done by @tylerflint and @jasondunsmore, I'm just cleaning up the branch.