Cache methods reworked.