CHANGE REQUEST: VAlidation roules non-cache workaound