[refactor] Use custom expiry-model for inheritance (breaks tests)