Fix model object cache issue