merged cache management to upstream 

Hi David,

Please pull the cache management updated repo to your upstream repo.

Thanks,
-Indradip.