re-add basic infrastructure for low level model caching