Abstraction bugfixes and Model Caching implementation as W