Update cache and queue to use interfaces