Fix: legacy: cl#5148 - Correctly remove a node that used to have a different nodeid
Merge pull request #268 from gao-yan/node-cache

Fix: legacy: cl#5148 - Correctly remove a node that used to have a different nodeid