Cache changes
Cleaned up cache and facotries