Cache system renamed, callbacks working