Fixed caching incorrect values and Economy