Merge "Fix item cache bug" into nyc-dev am: d3a7d47d00
am: fa3a8ee9bc

* commit 'fa3a8ee9bc7cf22e6725dd7df2926885a75a662d':
  Fix item cache bug

Change-Id: I02168d026b5caf81c29b100726d58b200258078c