Add new hooks and remove extra cache call
Merge pull request #60 from pavemen/feature

Add new hooks and remove extra cache call