Needs to be a ConcurrentHashMap, or synchronization here (and in the getters etc).