model fix for caching