Ensure subject doesn't run into date
Cache factory creation