Improve error handling
Increase cache expiration