Refactor en random caches?