Changed from WeakHashMap back to HashMap