Split cache out into separate file