Add support for cache