Switch to a WeakHashMap