diff --git a/.gas-snapshot b/.gas-snapshot
index ef911bb2..9d13b9f1 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,146 +1,147 @@
-IntegrationTestCaveats:testInvalidCaveatLength() (gas: 130019)
-IntegrationTestCaveats:testInvalidCaveats() (gas: 162046)
-IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 332147)
-IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 283288)
-IntegrationTestCaveats:testOriginateWCaveatsAsBorrower() (gas: 306526)
-IntegrationTestCaveats:testOriginateWCaveatsExpired() (gas: 159299)
-IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 168077)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 284586)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 141962)
-IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 283408)
-IntegrationTestCaveats:testRefinanceAsLender() (gas: 1053605)
-IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 407716)
-IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 347568)
-IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 456374)
-IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 377067)
-IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 402764)
-ModuleTesting:testFixedTermDutchAuctionSettlement() (gas: 438033)
-ModuleTesting:testFixedTermDutchAuctionSettlementAuctionNotStarted() (gas: 441409)
-ModuleTesting:testFixedTermDutchAuctionSettlementGetSettlementAuctionExpired() (gas: 440947)
-ModuleTesting:testFixedTermDutchAuctionSettlementNotValid() (gas: 437045)
-ModuleTesting:testFixedTermDutchAuctionSettlementValid() (gas: 437844)
-ModuleTesting:testModuleValidation() (gas: 1274232)
+IntegrationTestCaveats:testInvalidCaveatLength() (gas: 130030)
+IntegrationTestCaveats:testInvalidCaveats() (gas: 162079)
+IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 332191)
+IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 283321)
+IntegrationTestCaveats:testOriginateWCaveatsAsBorrower() (gas: 308842)
+IntegrationTestCaveats:testOriginateWCaveatsExpired() (gas: 159245)
+IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 168023)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 284597)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 141984)
+IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 283441)
+IntegrationTestCaveats:testRefinanceAsLender() (gas: 1053638)
+IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 407738)
+IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 347534)
+IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 456351)
+IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 377100)
+IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 402797)
+ModuleTesting:testFixedTermDutchAuctionSettlement() (gas: 438055)
+ModuleTesting:testFixedTermDutchAuctionSettlementAuctionNotStarted() (gas: 441431)
+ModuleTesting:testFixedTermDutchAuctionSettlementGetSettlementAuctionExpired() (gas: 440880)
+ModuleTesting:testFixedTermDutchAuctionSettlementNotValid() (gas: 437089)
+ModuleTesting:testFixedTermDutchAuctionSettlementValid() (gas: 437866)
+ModuleTesting:testModuleValidation() (gas: 1274276)
 PausableNonReentrantImpl:test() (gas: 2464)
 PausableNonReentrantImpl:testReentrancy() (gas: 2757)
 TestBorrowerEnforcer:testBERevertAdditionalTransfersFromBorrower() (gas: 76462)
 TestBorrowerEnforcer:testBERevertInvalidLoanTerms() (gas: 81160)
 TestBorrowerEnforcer:testBEValidLoanTerms() (gas: 72257)
 TestBorrowerEnforcer:testBEValidLoanTermsAnyIssuer() (gas: 72321)
-TestCustodian:testCannotLazyMintTwice() (gas: 82131)
-TestCustodian:testCannotMintInvalidLoanInvalidCustodian() (gas: 72437)
-TestCustodian:testCannotMintInvalidLoanValidCustodian() (gas: 77947)
-TestCustodian:testCustodianCannotBeAuthorized() (gas: 142196)
-TestCustodian:testCustodySelector() (gas: 2697813)
-TestCustodian:testDefaultCustodySelectorRevert() (gas: 72420)
-TestCustodian:testGenerateOrderInvalidPostRepayment() (gas: 173141)
-TestCustodian:testGenerateOrderInvalidPostSettlement() (gas: 163282)
-TestCustodian:testGenerateOrderRepay() (gas: 177299)
-TestCustodian:testGenerateOrderRepayAsRepayApprovedBorrower() (gas: 193763)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20() (gas: 875091)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20HandlerAuthorized() (gas: 804777)
-TestCustodian:testGenerateOrderRepayInvalidHookAddress() (gas: 97653)
-TestCustodian:testGenerateOrderRepayInvalidHookReturnType() (gas: 92014)
-TestCustodian:testGenerateOrderRepayNotBorrower() (gas: 106914)
-TestCustodian:testGenerateOrderSettlement() (gas: 155015)
-TestCustodian:testGenerateOrderSettlementHandlerAuthorized() (gas: 160412)
-TestCustodian:testGenerateOrderSettlementNoActiveLoan() (gas: 163460)
-TestCustodian:testGenerateOrderSettlementUnauthorized() (gas: 101879)
-TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 461629)
-TestCustodian:testGetBorrower() (gas: 78621)
-TestCustodian:testInvalidAction() (gas: 173362)
-TestCustodian:testInvalidActionRepayInActiveLoan() (gas: 130206)
-TestCustodian:testInvalidActionSettleActiveLoan() (gas: 130166)
-TestCustodian:testInvalidEncodedData() (gas: 26170)
-TestCustodian:testMintWithApprovalSetAsBorrower() (gas: 366745)
-TestCustodian:testMintWithApprovalSetAsBorrowerInvalidLoan() (gas: 64632)
-TestCustodian:testMintWithApprovalSetNotAuthorized() (gas: 66873)
-TestCustodian:testName() (gas: 7099)
-TestCustodian:testNonPayableFunctions() (gas: 215173)
-TestCustodian:testOnlySeaport() (gas: 17918)
-TestCustodian:testPreviewOrderNoActiveLoan() (gas: 105759)
-TestCustodian:testPreviewOrderRepay() (gas: 230309)
-TestCustodian:testPreviewOrderSettlement() (gas: 192037)
-TestCustodian:testPreviewOrderSettlementInvalidFufliller() (gas: 108320)
-TestCustodian:testPreviewOrderSettlementInvalidRepayer() (gas: 117031)
-TestCustodian:testRatifyOrder() (gas: 184120)
-TestCustodian:testSeaportMetadata() (gas: 8644)
+TestCustodian:testCannotLazyMintTwice() (gas: 82189)
+TestCustodian:testCannotMintInvalidLoanInvalidCustodian() (gas: 72517)
+TestCustodian:testCannotMintInvalidLoanValidCustodian() (gas: 77917)
+TestCustodian:testCustodianCannotBeAuthorized() (gas: 142208)
+TestCustodian:testCustodySelector() (gas: 2697893)
+TestCustodian:testDefaultCustodySelectorRevert() (gas: 72370)
+TestCustodian:testGenerateOrderInvalidPostRepayment() (gas: 173136)
+TestCustodian:testGenerateOrderInvalidPostSettlement() (gas: 163299)
+TestCustodian:testGenerateOrderRepay() (gas: 177294)
+TestCustodian:testGenerateOrderRepayAsRepayApprovedBorrower() (gas: 193780)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20() (gas: 875125)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20HandlerAuthorized() (gas: 804811)
+TestCustodian:testGenerateOrderRepayInvalidHookAddress() (gas: 97670)
+TestCustodian:testGenerateOrderRepayInvalidHookReturnType() (gas: 92031)
+TestCustodian:testGenerateOrderRepayNotBorrower() (gas: 106931)
+TestCustodian:testGenerateOrderSettlement() (gas: 155010)
+TestCustodian:testGenerateOrderSettlementHandlerAuthorized() (gas: 160407)
+TestCustodian:testGenerateOrderSettlementNoActiveLoan() (gas: 163477)
+TestCustodian:testGenerateOrderSettlementUnauthorized() (gas: 101896)
+TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 461657)
+TestCustodian:testGetBorrower() (gas: 78643)
+TestCustodian:testInvalidAction() (gas: 173596)
+TestCustodian:testInvalidActionRepayInActiveLoan() (gas: 130218)
+TestCustodian:testInvalidActionSettleActiveLoan() (gas: 130156)
+TestCustodian:testInvalidEncodedData() (gas: 26160)
+TestCustodian:testMintWithApprovalSetAsBorrower() (gas: 366778)
+TestCustodian:testMintWithApprovalSetAsBorrowerInvalidLoan() (gas: 64523)
+TestCustodian:testMintWithApprovalSetNotAuthorized() (gas: 66842)
+TestCustodian:testName() (gas: 7121)
+TestCustodian:testNonPayableFunctions() (gas: 215289)
+TestCustodian:testOnlySeaport() (gas: 17829)
+TestCustodian:testPreviewOrderNoActiveLoan() (gas: 105776)
+TestCustodian:testPreviewOrderRepay() (gas: 230321)
+TestCustodian:testPreviewOrderSettlement() (gas: 192049)
+TestCustodian:testPreviewOrderSettlementInvalidFufliller() (gas: 108337)
+TestCustodian:testPreviewOrderSettlementInvalidRepayer() (gas: 117048)
+TestCustodian:testRatifyOrder() (gas: 184115)
+TestCustodian:testSeaportMetadata() (gas: 8666)
 TestCustodian:testSupportsInterface() (gas: 9428)
-TestCustodian:testSymbol() (gas: 7216)
-TestCustodian:testTokenURI() (gas: 84130)
-TestCustodian:testTokenURIInvalidLoan() (gas: 13157)
-TestLenderEnforcer:testLERevertAdditionalTransfersFromLender() (gas: 76455)
-TestLenderEnforcer:testLERevertInvalidLoanTerms() (gas: 81096)
-TestLenderEnforcer:testLEValidLoanTerms() (gas: 72169)
-TestLenderEnforcer:testLEValidLoanTermsAnyBorrower() (gas: 72323)
-TestLenderEnforcer:testLEValidLoanTermsWithAdditionalTransfers() (gas: 73525)
+TestCustodian:testSymbol() (gas: 7127)
+TestCustodian:testTokenURI() (gas: 84268)
+TestCustodian:testTokenURIInvalidLoan() (gas: 13179)
+TestLenderEnforcer:testLERevertAdditionalTransfersFromLender() (gas: 76366)
+TestLenderEnforcer:testLERevertInvalidLoanTerms() (gas: 81118)
+TestLenderEnforcer:testLEValidLoanTerms() (gas: 72191)
+TestLenderEnforcer:testLEValidLoanTermsAnyBorrower() (gas: 72234)
+TestLenderEnforcer:testLEValidLoanTermsWithAdditionalTransfers() (gas: 73547)
 TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 591976)
-TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 599167)
-TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 590438)
-TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 580300)
-TestNewLoan:testBuyNowPayLater() (gas: 2873894)
+TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 599189)
+TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 590460)
+TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 580322)
+TestNewLoan:testBuyNowPayLater() (gas: 2873886)
 TestNewLoan:testInvalidSenderBNPL() (gas: 1613098)
 TestNewLoan:testInvalidUserDataHashBNPL() (gas: 1615699)
-TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 874115)
-TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 885129)
-TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 429545)
-TestNewLoan:testNewLoanRefinance() (gas: 590031)
+TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 874126)
+TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 885151)
+TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 429567)
+TestNewLoan:testNewLoanRefinance() (gas: 590053)
 TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 326073)
-TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 384859)
-TestNewLoan:testSettleLoan() (gas: 642171)
-TestPausableNonReentrant:testNotOwner() (gas: 21254)
-TestPausableNonReentrant:testPauseAndUnpause() (gas: 22621)
+TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 384870)
+TestNewLoan:testSettleLoan() (gas: 642193)
+TestPausableNonReentrant:testNotOwner() (gas: 21276)
+TestPausableNonReentrant:testPauseAndUnpause() (gas: 22643)
 TestPausableNonReentrant:testReentrancy() (gas: 15404)
-TestPausableNonReentrant:testUnpauseWhenNotPaused() (gas: 12582)
-TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 667169)
-TestRepayLoan:testRepayLoanBase() (gas: 599955)
-TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 438687)
-TestRepayLoan:testRepayLoanInSettlement() (gas: 585892)
-TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 603988)
-TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 858823)
+TestPausableNonReentrant:testUnpauseWhenNotPaused() (gas: 12604)
+TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 667213)
+TestRepayLoan:testRepayLoanBase() (gas: 599977)
+TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 438709)
+TestRepayLoan:testRepayLoanInSettlement() (gas: 585914)
+TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 604010)
+TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 858845)
 TestSimpleInterestPricing:test_calculateInterest() (gas: 881296)
 TestSimpleInterestPricing:test_getPaymentConsideration() (gas: 928510)
 TestSimpleInterestPricing:test_getRefinanceConsideration() (gas: 919314)
 TestStarport:testAcquireTokensFail() (gas: 60430)
 TestStarport:testAcquireTokensSuccess() (gas: 162999)
 TestStarport:testActive() (gas: 69224)
-TestStarport:testAdditionalTransfers() (gas: 300721)
-TestStarport:testAdditionalTransfersOriginate() (gas: 275417)
+TestStarport:testAdditionalTransfers() (gas: 300732)
+TestStarport:testAdditionalTransfersOriginate() (gas: 275428)
 TestStarport:testAdditionalTransfersRefinance() (gas: 218147)
 TestStarport:testApplyRefinanceConsiderationToLoanMalformed() (gas: 129974)
-TestStarport:testCannotIssueSameLoanTwice() (gas: 364057)
+TestStarport:testCannotIssueSameLoanTwice() (gas: 364079)
 TestStarport:testCannotOriginateWhilePaused() (gas: 73567)
 TestStarport:testCannotSettleInvalidLoan() (gas: 74903)
 TestStarport:testCannotSettleUnlessValidCustodian() (gas: 70963)
-TestStarport:testCaveatEnforcerRevert() (gas: 100284)
-TestStarport:testDefaultFeeRake1() (gas: 387818)
-TestStarport:testDefaultFeeRake2() (gas: 450161)
-TestStarport:testDefaultFeeRakeExoticDebt() (gas: 397641)
-TestStarport:testExoticDebtWithCustomPricingAndRepayment() (gas: 1237839)
-TestStarport:testExoticDebtWithCustomPricingAndSettlement() (gas: 1692860)
-TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 376819)
+TestStarport:testCaveatEnforcerRevert() (gas: 102578)
+TestStarport:testDefaultFeeRake1() (gas: 387829)
+TestStarport:testDefaultFeeRake2() (gas: 450172)
+TestStarport:testDefaultFeeRakeExoticDebt() (gas: 397652)
+TestStarport:testEIP712Signing() (gas: 83020)
+TestStarport:testExoticDebtWithCustomPricingAndRepayment() (gas: 1237850)
+TestStarport:testExoticDebtWithCustomPricingAndSettlement() (gas: 1692871)
+TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 376830)
 TestStarport:testIncrementCaveatNonce() (gas: 35292)
 TestStarport:testInitializedFlagSetProperly() (gas: 67438)
-TestStarport:testInvalidAdditionalTransfersOriginate() (gas: 230392)
+TestStarport:testInvalidAdditionalTransfersOriginate() (gas: 230403)
 TestStarport:testInvalidAdditionalTransfersRefinance() (gas: 170796)
-TestStarport:testInvalidAmountCollateral() (gas: 165912)
-TestStarport:testInvalidAmountCollateral721() (gas: 165934)
-TestStarport:testInvalidItemType() (gas: 151860)
-TestStarport:testInvalidTransferLengthCollateral() (gas: 154173)
-TestStarport:testInvalidTransferLengthDebt() (gas: 175950)
+TestStarport:testInvalidAmountCollateral() (gas: 165945)
+TestStarport:testInvalidAmountCollateral721() (gas: 165945)
+TestStarport:testInvalidItemType() (gas: 151893)
+TestStarport:testInvalidTransferLengthCollateral() (gas: 154184)
+TestStarport:testInvalidTransferLengthDebt() (gas: 175961)
 TestStarport:testInvalidateCaveatSalt() (gas: 33450)
-TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 264255)
-TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 290380)
-TestStarport:testNonPayableFunctions() (gas: 112229)
-TestStarport:testOverrideFeeRake() (gas: 384052)
+TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 264266)
+TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 290391)
+TestStarport:testNonPayableFunctions() (gas: 114523)
+TestStarport:testOverrideFeeRake() (gas: 384063)
 TestStarport:testPause() (gas: 18259)
-TestStarport:testRefinancePostRepaymentFails() (gas: 127973)
+TestStarport:testRefinancePostRepaymentFails() (gas: 127886)
 TestStarport:testStargateGetOwner() (gas: 8808)
-TestStarport:testTokenNoCodeCollateral() (gas: 150695)
-TestStarport:testTokenNoCodeDebt() (gas: 180946)
+TestStarport:testTokenNoCodeCollateral() (gas: 150706)
+TestStarport:testTokenNoCodeDebt() (gas: 180957)
 TestStarport:testUnpause() (gas: 17363)
 TestStrategistOriginator:testEncodeWithAccountCounter() (gas: 12330)
 TestStrategistOriginator:testGetStrategistData() (gas: 1809233)
-TestStrategistOriginator:testIncrementCounterAsStrategist() (gas: 38767)
+TestStrategistOriginator:testIncrementCounterAsStrategist() (gas: 38790)
 TestStrategistOriginator:testIncrementCounterNotAuthorized() (gas: 13423)
 TestStrategistOriginator:testInvalidCollateral() (gas: 211094)
 TestStrategistOriginator:testInvalidDeadline() (gas: 216915)
@@ -149,7 +150,7 @@ TestStrategistOriginator:testInvalidDebtAmountAskingMoreThanOffered() (gas: 2131
 TestStrategistOriginator:testInvalidDebtAmountOfferingZero() (gas: 213486)
 TestStrategistOriginator:testInvalidDebtAmountRequestingZero() (gas: 213441)
 TestStrategistOriginator:testInvalidDebtLength() (gas: 212096)
-TestStrategistOriginator:testInvalidOffer() (gas: 427919)
+TestStrategistOriginator:testInvalidOffer() (gas: 427930)
 TestStrategistOriginator:testInvalidSigner() (gas: 215234)
 TestStrategistOriginator:testSetStrategist() (gas: 17884)
 TestStrategistOriginator:testWithdraw() (gas: 168001)
\ No newline at end of file
diff --git a/src/Starport.sol b/src/Starport.sol
index 1a8cd9fc..1545b058 100644
--- a/src/Starport.sol
+++ b/src/Starport.sol
@@ -582,8 +582,10 @@ contract Starport is PausableNonReentrant {
         );
 
         if (signedCaveats.singleUse) {
-            invalidSalts.validateSalt(validator, signedCaveats.salt);
+            invalidSalts.validateSalt(validator, signedCaveats.salt); //Validates and invalidates salt
             emit CaveatFilled(validator, hash, signedCaveats.salt);
+        } else if (invalidSalts[validator][signedCaveats.salt]) {
+            revert StarportLib.InvalidSalt();
         }
 
         if (block.timestamp > signedCaveats.deadline) {