Fix incorrect display of error messages
Pass None for expired_cache_entry if no cache entry was present
Improve handling of aged data