Adjust caching variables and usage