change (fix?) the caching mechanism