reworked the cache
resolve conflict