Merge "Fix item cache bug" into nyc-dev