Rework cache aspect