Good call to remove this.  I've never liked the model cache.  I think I'm going to nuke it for now and only add it back when we do our K3 optimization pass.