Changes to support changes to cache item