Enhance modelwraper to prevent from ctaching