CachableNode refactoring