Remove hash caching
Merge branch 'master' into speed