ICache Mangle Test Fixes

Simplification and CachingManager leak fix. Please see commits messages for details.