Adapt to cache system changes