Reverting back to concurrenthashmap, because I know it works...