Update cache.
Some tweaks