Fixes cache providers to ensure it stores and resolves clones