added caching of entityMaps, prepared to add file reading