Don't cache entire successful responses before returning them
Minor cleanup