This fixes #8335.  It now caches based on group.