Renamed QueueBasedPrediction serviced and changed the interface it
implements, then added expiry to cache