Used new map method on IDataHolder to simplify caching in LoaderFactory.