Merge "Fix for cache cleanup in protocol plugin on container deletion"