Updates based on comments: cache data, corrected doc text.