Remove need to cache API request