Caching update

Also this class is NOT thread safe