Caching fix, file node fix, minor deprecation cleanup