Backporting features and adding cache purging