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

* commit 'd3a7d47d007faad84356f5f846f92f4abfdff1df':
  Fix item cache bug

Change-Id: I01ec7e8841ac59e30156beb5f25015a37228e28b