Add more caching to GR entity types