New changes are now working with cache