Fix: remove dot
Improve: move hash generation of cache key into cache