Back to using caps