Remove deprecated value in argument and disable caching

This change aligns better changes required in the 3.x branch