am 1ab02c36: (-s ours) Part of fix for bug 5523834, backporting cache fixes

* commit '1ab02c36bee95e85558f6815b2836e9ee6a26b19':
  Part of fix for bug 5523834, backporting cache fixes