Cahnges on cache strategy