further clean-up WeakCache