Bug fix for source/sink caching on node removal