Stackpath (one of many CDNs) published an article just on the topic – https://support.stackpath.com/hc/en-us/articles/360001224166-Cache-Busting-Explained.
The recommendation as you’ll find is typically to utilize file paths instead of query strings.
The current solution is likely to be less effective (depending on factors such as CDNS configurations, hosting service providers, etc).
Rather than rewrite the current implementation, it may be worthwhile to consider a secondary branch that can replace the existing solution.
Do you have an idea which release it could be included in?