Merge pull request #2022 from alecchendev/2023-02-cache-peer-nodeid