Fix (core); changed models caching