Actually fixed cache (time to implement tests again)