Added update caching