Preserve itemization when caching

suggested by pmichaud++