OPSINT-783 Refactor clients caching