fixed cache issue