am 1ebeed45: Fix edge case cache issues

* commit '1ebeed45d206ed306eb149e4e63242b1b55558ef':
  Fix edge case cache issues