Add Comments and rename ByCache => PropertyIndex.