Update preparation for git-cache use

Now that git cache is merged, let's do this.