Caches support 2.6.1 API