(#1233) - add option for cache