Moved caching into conditional so no caching empty res