fixed bugs with cache