Tidy up response parsing
Fix response caching