Updated caching rules