am 1c9d33f8: Merge "Add a test for ND cache behaviour."

* commit '1c9d33f85fe9365c62cd0c224fde19b4d31d9d03':
  Add a test for ND cache behaviour.