Fixed Mapping caching.