I've marked it for 6.0 as the current helpers are static so they don't have access to the needed metadata without making changes to the API, but if someone has a sensible suggestion to do it earlier I'm happy to schedule this for sooner.