Improved cache classes.