Refactoring modules, hydration example
Build a hydrator
Bugfix the cache fetch step