Update on caching code