Remove hook and cache
merge w/ samo.