fixed issues with cache