added other caching, pending tests