Merge pull request #1 from shmax/implement-model-caching

model caching
Merge pull request #2 from shmax/implement-model-caching

Implement model caching
whitespace fixes and change expire default