https://github.com/spring-projects/spring-framework/issues/33388 is now fixed so we can replace our current duplicate strings.