Fix cancelling of ortholog cache loading & minor refactoring