Added expiring date management to cache management