Fix another bug and add param for caching with data param