Merge "Fix RepoGroup caching bug"