Remove global state, the entity store caches results

Change-Id: Ia3f375872b7858aaf3fc9a3d18c5f6ea4c54e101
Merge "Remove global state, the entity store caches results"