caching layer basic test + some fixes