Added cache to model