fix to allow cache per model