changes to cache management
Finish Feature-cache