code cleanup
Merge pull request #529 from kurund/group-cache

code cleanup