Fix caching of sub model grade