Tweaked Cache's use of C++ features