Fixes to cachewrapper, several imports missing.