[OLINGO-261][OLINGO-260] Improving singleton handling