Add initial caching code