Moved WeakMaps to static storage