Refactor, Group cache.