Added remove-handler for caches