Final improvements on Cache