[core] Bug Fix: Properly return the computed expiration