Model change: multiple caches, mode values
15 files changed