Cache model
Removed wrapping
Do not override config
Merge pull request #1 from IonicaBizau/random-fixes

Random fixes