Added Test. Removed cache.