caching calls to get_entity
Merge branch 'i9-database-indexes' into develop