Merge "Add a test for ND cache behaviour."