Fixed caching expiry issue