Fixed model
Improved cache