Merge "Don't re-render CachedSets" into sc-dev