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

* commit '74bce7522ba1b38e3d771e08740fcfb05549f746':
  Fix item cache bug

Change-Id: Ic8381b0a3c621bcf2d5359ed441e0b2689f7f30a