Added support for caching discovered API