More hacks towards keeping the model cached