Make cache swapping optional