Fix for #1211, by refreshing (for free) cached facility info when possible

Simple fix, bug not satisfied with the code organization.  See #1219 for that complaint.

@jamalex if you have any code comments, they're welcome.  Testing is simple and done.

Will merge on Wed if you don't have time to take a look!