Improve Cache usage