finished caching with last tests and fixes