TFJ-853 use ConcurrentHashMap instead of HashMap