Remove caching due to node id recycling