Added support for local caches