Added expiration to caching