Fixed CV caching.