Change the WeakHashMap to a ConcurrentHashMap because we don't need that
complexity.