FIxes to make cache parameter behave more as expected