Improved the Cache Control