Improved cache usage