fixing issue with caching