Added custom caches