Add cache settings and decorator