Cache system logic changes