Concurrency bugfix for DataMapperFactory

* concurrency fix for DataMapperFactory for the case of assigning
  a data mapper for non-default types (such as a custom enum)