Changed behaviour singleton lifecycle?