Merge "[Fix extra data in cache]" into nyc-dev