[WIP] Caching

issue #1