Added sorting of group names and longer cache time