Are you sure this has the same behaviour as before? The definition of `getOrElseUpdate` doesn't seem to take `null` values into account.