First step for #3692, Add support for new opencaching nodes

- Extend key handling for the new sites