Add new hooks and remove extra cache call