#4590 using concurrent map
Merge pull request #4591 from dotCMS/issue-4590-cache-non-concurrent-map

#4590 using concurrent map