fixed cache handling