Added initial bits on caching (wip)