Improved cache support