merged from master : generic caches solutions support
a couple of fixes