Add caching of requests
Add test