Makes it so we have one and only ONE cache store

@jduff looky ?