Improve cache delivery
Improved to refect contens