Update for caching in NDB