Small fix to prevent too much caching