Some changes in cache management logic
Some changes in cache management logic