S58591 Changes to support timebox (iteration) scope caching