Merge "libutils: fix cache removal when callback invalidates the key"