Added nonce caching