Updates cache keys to fix the CircleCI permissions errors we've seen. Builds will be a bit slow while the cache rebuilds.