Added upgrade path and fixed cache method names.