House keeping + added cached services