fixed cache issues