Fix for MapCargo caching
Refactoring