am a972e26e: Part of fix for bug 5523834, backporting cache fixes

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