[IMP] Cache system init. Some improvement in code structure