Setup cache but now need to rework things