Merge "Revert "Revert "Stop dropping caches now we have kernel fix""" into oc-dev