Names changes

+ localization cache bugfix
+ include cache enhanced