Added caching of build results