Fixed caching updating every time