This is a good refactor, nice work 👍🏻. I'm however not entirely sold on the lru eviction policy since it's based on connection establishment time and not connection usage (i.e. we may end evicting a busy connection). (See related comment for additional context.)

Raised two points inline and we should at least fix the nil check, but once that's fixed I think this is good to go, approved. 👍🏻