abstract modified
Cache changed to cache and other changes