Remove hook and cache

Should still work too.