Add cache test
Refactor to grab all details from a single request. Improve caching