Changes to cache components