Fixed caching bug

Default to serving cached content when possible