#4590 using concurrent map

I guess we need this in release-2.5.2