Is thread-safety a concern in this class? if yes, perhaps ConcurrentHashMap should be considered?