am cd399bad: Merge "Change cache dependency tracking."

* commit 'cd399bad1941cbc64e5d52314370fddb1b83faae':
  Change cache dependency tracking.