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

* commit '8d89dbb0555715bcdf6f65c9889766e7eccc67f1':
  Fix edge case cache issues