fix cache, fix node validation.