Add sort fields cache, see #4