Fixed an issue with cache lifetime