Group caching problems

Committing some changes to see if anyone can solve this group caching
problem.