am 8444b257: am 1ebeed45: Fix edge case cache issues

* commit '8444b257b0053c4bde274138350039c0880a5abf':
  Fix edge case cache issues