Better alignment and caching