Added caching of API call