Fix group caching bug