master
TEST: Conditionalise usage and testing of key invalidation
TEST: Insert a delay in the key invalidation test to allow for gc delays