Can you move this initialization of the HashMap into the getter, in order to keep the getter null-safe?