Add cache functionality on block and page