[ISSUE-34] Fixed a bug where constructor injection resulted in NPE when mapped ToSingleton