fix wrong CacheServiceProvider
fix code structure