Resolve "get rid of custom Map caching in service layer"

Merged Piotr Gawron requested to merge 1007-get-rid-of-custom-map-caching-in-service-layer into master
Edited by Piotr Gawron

Merge request reports