Merge "Disable Jack's NNode cache"