More work on Node caches and nulls