Revert "Fix "Bug 5589 - Deprecate PortNumberCache""