Caching support extended.