removed custom caching, added johnny-cache