Clean up caching
Push more down into model