Fixing blocking issue with session usage in services