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

Placeholder Piotr Gawronrequested to merge
1007-get-rid-of-custom-map-caching-in-service-layer into master

Closes #1007 (closed)

Edited by Placeholder Piotr Gawron

Merge request reports