Start adding in cache stuff