[#1706] Changed HashMap to use a thread safe wrapper.