FYI for storm this would need to be thread safe, so maybe if we aren't bothering for thread safety not worth considering too much.