Ooops forgot to uncomment cached decorator