Use suppliers instead of single instances, fixes #15