Make `MapBuilder` and `MapEnricher` secure for multiple instances

For now they use static properties which are not really instance safe. So creating multiple of those objects will likely cause further problems that are not intended.

Also it is completely unnecessary and is a risk for testing.