Altered cache a little more