Some improvements to the CacheWeaver