Add support for local cache