Improve caplet API