ensure taking the 'cache_on_set' option into account in all paths

+ minor cleanings