Fix keyPath issue
Fix model cache key issues