Renamed MappingCache to MapFactory