Enhancement cache removal listener

[amccurry]

Cache removal listener is now a blocking call. Some aspects of the call should be made async.