Fix caching in Nodes