Changed caching to be handled in NData instead