FFJ-13 rollback
FFJ-13 cache appSecretProof by Map